diff options
author | Bo Hu <bohu@google.com> | 2016-05-02 17:43:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-02 17:43:48 +0000 |
commit | d087f8821cf5910d85f90a82267ccf5d47797204 (patch) | |
tree | bf9f19474b133d5c65967d6ed6f187b5d6d4c251 /apps | |
parent | 2c0d616e279903689716cbd25b762e74bbcce2fe (diff) | |
parent | 44de50be48ea9450d44e1aba6097c45de565c997 (diff) | |
download | android_development-d087f8821cf5910d85f90a82267ccf5d47797204.tar.gz android_development-d087f8821cf5910d85f90a82267ccf5d47797204.tar.bz2 android_development-d087f8821cf5910d85f90a82267ccf5d47797204.zip |
Merge "Revert "Emulator: enable predexopt for some sample apps"" into nyc-dev am: 4b0fd87660 am: 861f784752
am: 44de50be48
* commit '44de50be48ea9450d44e1aba6097c45de565c997':
Revert "Emulator: enable predexopt for some sample apps"
Change-Id: If0ce23b2e2c8b51f451d90911623e5ab0dbc2a11
Diffstat (limited to 'apps')
-rw-r--r-- | apps/GestureBuilder/Android.mk | 2 | ||||
-rw-r--r-- | apps/WidgetPreview/Android.mk | 2 |
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 |