Merge "Revert "Emulator: enable predexopt for some sample apps"" into…

… nyc-dev am: 4b0fd87 * commit '4b0fd876600d41567744cc76bd572c8d2b31ea7e': Revert "Emulator: enable predexopt for some sample apps" Change-Id: I3f43230d40612cba121f4b9750dfa0a5c981eee7
aosp-mirror · May 2, 2016 · a2f5ea2 · a2f5ea2
2 parents 04ba26b + 4b0fd87
commit a2f5ea2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/apps/GestureBuilder/Android.mk b/apps/GestureBuilder/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := samples tests
-LOCAL_DEX_PREOPT := true
+
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := GestureBuilder

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

diff --git a/samples/ApiDemos/Android.mk b/samples/ApiDemos/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
 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 += \

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

diff --git a/samples/SoftKeyboard/Android.mk b/samples/SoftKeyboard/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := samples
-LOCAL_DEX_PREOPT := true
+
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_SDK_VERSION := current