Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
* tag 'android-6.0.0_r26':
TestingCamera1/2: Disable dex preopt
Change-Id: I79fb35d8b16b905408c1c7b0f35cf6ec230fe309
diff --git a/apps/TestingCamera/Android.mk b/apps/TestingCamera/Android.mk
index e6829fd..9b9129a 100644
--- a/apps/TestingCamera/Android.mk
+++ b/apps/TestingCamera/Android.mk
@@ -27,6 +27,8 @@
$(call all-java-files-under, src) \
$(call all-renderscript-files-under, src)
+LOCAL_DEX_PREOPT := false
+
LOCAL_PACKAGE_NAME := TestingCamera
include $(BUILD_PACKAGE)
diff --git a/apps/TestingCamera2/Android.mk b/apps/TestingCamera2/Android.mk
index 868de25..983feae 100644
--- a/apps/TestingCamera2/Android.mk
+++ b/apps/TestingCamera2/Android.mk
@@ -28,6 +28,8 @@
$(call all-java-files-under, src) \
$(call all-renderscript-files-under, src)
+LOCAL_DEX_PREOPT := false
+
LOCAL_PACKAGE_NAME := TestingCamera2
include $(BUILD_PACKAGE)