summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBo Hu <bohu@google.com>2016-05-02 17:35:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-02 17:35:14 +0000
commita2f5ea2872acc88cde6b0b4b76c63f59927ee614 (patch)
treee0c68f43200de4d0b26a91dc531ccac4496f77f3 /apps
parent04ba26b4e614a92059cf328e5b37b0e226b88438 (diff)
parent4b0fd876600d41567744cc76bd572c8d2b31ea7e (diff)
downloadandroid_development-a2f5ea2872acc88cde6b0b4b76c63f59927ee614.tar.gz
android_development-a2f5ea2872acc88cde6b0b4b76c63f59927ee614.tar.bz2
android_development-a2f5ea2872acc88cde6b0b4b76c63f59927ee614.zip
Merge "Revert "Emulator: enable predexopt for some sample apps"" into nyc-dev
am: 4b0fd87660 * commit '4b0fd876600d41567744cc76bd572c8d2b31ea7e': Revert "Emulator: enable predexopt for some sample apps" Change-Id: I3f43230d40612cba121f4b9750dfa0a5c981eee7
Diffstat (limited to 'apps')
-rw-r--r--apps/GestureBuilder/Android.mk2
-rw-r--r--apps/WidgetPreview/Android.mk2
2 files changed, 2 insertions, 2 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