summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBo Hu <bohu@google.com>2016-05-02 17:20:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-02 17:20:15 +0000
commit4b0fd876600d41567744cc76bd572c8d2b31ea7e (patch)
tree0d9f2be89f6ff2258712f260f50353416f5e1d13 /apps
parentcb84ec875e1d15575726adfb4592d27522eea070 (diff)
parent14e8cd50f29835447a69dad2c30bf4502bee2641 (diff)
downloadandroid_development-4b0fd876600d41567744cc76bd572c8d2b31ea7e.tar.gz
android_development-4b0fd876600d41567744cc76bd572c8d2b31ea7e.tar.bz2
android_development-4b0fd876600d41567744cc76bd572c8d2b31ea7e.zip
Merge "Revert "Emulator: enable predexopt for some sample apps"" into nyc-dev
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