diff options
| author | Bo Hu <bohu@google.com> | 2016-05-02 17:16:53 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-05-02 17:15:25 -0700 |
| commit | e0d5c41d6b31a4cc66f56da0d5be39d5b1f6379b (patch) | |
| tree | 0d9f2be89f6ff2258712f260f50353416f5e1d13 | |
| parent | ee35375e30dc0047e93118238bc95883a2405759 (diff) | |
| download | android_development-e0d5c41d6b31a4cc66f56da0d5be39d5b1f6379b.tar.gz android_development-e0d5c41d6b31a4cc66f56da0d5be39d5b1f6379b.tar.bz2 android_development-e0d5c41d6b31a4cc66f56da0d5be39d5b1f6379b.zip | |
Revert "Emulator: enable predexopt for some sample apps"
because it breaks jank tests.
revert first
This reverts commit 59581fb6d478cfee517a078aea2d5c002f4c7fb9.
Change-Id: Ic4b07b28edd387826fc58df86b02bbab460c9074
| -rw-r--r-- | apps/GestureBuilder/Android.mk | 2 | ||||
| -rw-r--r-- | apps/WidgetPreview/Android.mk | 2 | ||||
| -rw-r--r-- | samples/ApiDemos/Android.mk | 2 | ||||
| -rw-r--r-- | samples/CubeLiveWallpaper/Android.mk | 2 | ||||
| -rwxr-xr-x | samples/SoftKeyboard/Android.mk | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/apps/GestureBuilder/Android.mk b/apps/GestureBuilder/Android.mk index 79532df35..424844394 100644 --- 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 index f1a97964a..04a492798 100644 --- 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 index 75748734f..66100b168 100644 --- 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 index 08c90c83b..f14c5e656 100644 --- 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 index 3fbd831bc..883bf2fd7 100755 --- 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 |