commit c45ef7ee016b4b4d4e50a918c502440678a02254
author Bo Hu <bohu@google.com> Mon May 02 17:16:53 2016 +0000
committer The Android Automerger <android-build@google.com> Mon May 02 16:13:12 2016 -0700
tree 0d9f2be89f6ff2258712f260f50353416f5e1d13
parent 0ccaed41a37a68e934177fd5b40d06f9af03e66c

Revert "Emulator: enable predexopt for some sample apps"

because it breaks jank tests.
revert first


This reverts commit 59581fb6d478cfee517a078aea2d5c002f4c7fb9.

Change-Id: Ic4b07b28edd387826fc58df86b02bbab460c9074

apps/GestureBuilder/Android.mk

diff --git a/apps/GestureBuilder/Android.mk b/apps/GestureBuilder/Android.mk
index 79532df..4248443 100644
--- a/apps/GestureBuilder/Android.mk
+++ b/apps/GestureBuilder/Android.mk
@@ -18,7 +18,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := samples tests
-LOCAL_DEX_PREOPT := true
+
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := GestureBuilder

apps/WidgetPreview/Android.mk

diff --git a/apps/WidgetPreview/Android.mk b/apps/WidgetPreview/Android.mk
index f1a9796..04a4927 100644
--- a/apps/WidgetPreview/Android.mk
+++ b/apps/WidgetPreview/Android.mk
@@ -18,7 +18,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := samples
-LOCAL_DEX_PREOPT := true
+
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := WidgetPreview

samples/ApiDemos/Android.mk

diff --git a/samples/ApiDemos/Android.mk b/samples/ApiDemos/Android.mk
index 7574873..66100b1 100644
--- a/samples/ApiDemos/Android.mk
+++ b/samples/ApiDemos/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := samples tests
-LOCAL_DEX_PREOPT := true
+
 # Only compile source java files in this apk.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += \

samples/CubeLiveWallpaper/Android.mk

diff --git a/samples/CubeLiveWallpaper/Android.mk b/samples/CubeLiveWallpaper/Android.mk
index 08c90c8..f14c5e6 100644
--- a/samples/CubeLiveWallpaper/Android.mk
+++ b/samples/CubeLiveWallpaper/Android.mk
@@ -18,7 +18,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := samples
-LOCAL_DEX_PREOPT := true
+
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := CubeLiveWallpapers

samples/SoftKeyboard/Android.mk

diff --git a/samples/SoftKeyboard/Android.mk b/samples/SoftKeyboard/Android.mk
index 3fbd831..883bf2f 100755
--- a/samples/SoftKeyboard/Android.mk
+++ b/samples/SoftKeyboard/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := samples
-LOCAL_DEX_PREOPT := true
+
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_SDK_VERSION := current