diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-04-27 10:46:39 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-04-27 10:56:10 -0700 |
| commit | 2c9bd225dfa445a2967ebe8fa4428609020478b1 (patch) | |
| tree | 20cfde49e208ddb804406f69e3ab2b9859b2bd9b /Android.mk | |
| parent | 2d01066db24c19f9384f50ff71806cbb4835c7f9 (diff) | |
| download | art-2c9bd225dfa445a2967ebe8fa4428609020478b1.zip art-2c9bd225dfa445a2967ebe8fa4428609020478b1.tar.gz art-2c9bd225dfa445a2967ebe8fa4428609020478b1.tar.bz2 | |
Fix clean-oat
Change to use adb shell sh -c <cmd>.
Also fixed other phony targets, deleted smart mode and added
verify-at-runtime mode.
Change-Id: I562117774eaa153e66b46d6f173fe993931018b7
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 36 |
1 files changed, 18 insertions, 18 deletions
@@ -55,16 +55,16 @@ endif clean-oat-target: adb root adb wait-for-device remount - adb shell rm -rf $(ART_TARGET_NATIVETEST_DIR) - adb shell rm -rf $(ART_TARGET_TEST_DIR) - adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*/* - adb shell rm -rf $(DEXPREOPT_BOOT_JAR_DIR)/$(DEX2OAT_TARGET_ARCH) - adb shell rm -rf system/app/$(DEX2OAT_TARGET_ARCH) + adb shell sh -c "rm -rf $(ART_TARGET_NATIVETEST_DIR)" + adb shell sh -c "rm -rf $(ART_TARGET_TEST_DIR)" + adb shell sh -c "rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*/*" + adb shell sh -c "rm -rf $(DEXPREOPT_BOOT_JAR_DIR)/$(DEX2OAT_TARGET_ARCH)" + adb shell sh -c "rm -rf system/app/$(DEX2OAT_TARGET_ARCH)" ifdef TARGET_2ND_ARCH - adb shell rm -rf $(DEXPREOPT_BOOT_JAR_DIR)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) - adb shell rm -rf system/app/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) + adb shell sh -c "rm -rf $(DEXPREOPT_BOOT_JAR_DIR)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)" + adb shell sh -c "rm -rf system/app/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)" endif - adb shell rm -rf data/run-test/test-*/dalvik-cache/* + adb shell sh -c "rm -rf data/run-test/test-*/dalvik-cache/*" ifneq ($(art_dont_bother),true) @@ -404,7 +404,7 @@ use-dalvik: use-art-full: adb root adb wait-for-device shell stop - adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/* + adb shell sh -c "rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*" adb shell setprop dalvik.vm.dex2oat-filter "" adb shell setprop dalvik.vm.image-dex2oat-filter "" adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so @@ -414,19 +414,19 @@ use-art-full: use-artd-full: adb root adb wait-for-device shell stop - adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/* + adb shell sh -c "rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*" adb shell setprop dalvik.vm.dex2oat-filter "" adb shell setprop dalvik.vm.image-dex2oat-filter "" adb shell setprop persist.sys.dalvik.vm.lib.2 libartd.so adb shell start -.PHONY: use-art-smart -use-art-smart: +.PHONY: use-art-verify-at-runtime +use-art-verify-at-runtime: adb root adb wait-for-device shell stop - adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/* - adb shell setprop dalvik.vm.dex2oat-filter "interpret-only" - adb shell setprop dalvik.vm.image-dex2oat-filter "" + adb shell sh -c "rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*" + adb shell setprop dalvik.vm.dex2oat-filter "verify-at-runtime" + adb shell setprop dalvik.vm.image-dex2oat-filter "verify-at-runtime" adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so adb shell start @@ -434,7 +434,7 @@ use-art-smart: use-art-interpret-only: adb root adb wait-for-device shell stop - adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/* + adb shell sh -c "rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*" adb shell setprop dalvik.vm.dex2oat-filter "interpret-only" adb shell setprop dalvik.vm.image-dex2oat-filter "interpret-only" adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so @@ -444,7 +444,7 @@ use-art-interpret-only: use-artd-interpret-only: adb root adb wait-for-device shell stop - adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/* + adb shell sh -c "rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*" adb shell setprop dalvik.vm.dex2oat-filter "interpret-only" adb shell setprop dalvik.vm.image-dex2oat-filter "interpret-only" adb shell setprop persist.sys.dalvik.vm.lib.2 libartd.so @@ -454,7 +454,7 @@ use-artd-interpret-only: use-art-verify-none: adb root adb wait-for-device shell stop - adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/* + adb shell sh -c "rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*" adb shell setprop dalvik.vm.dex2oat-filter "verify-none" adb shell setprop dalvik.vm.image-dex2oat-filter "verify-none" adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so |