summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2015-03-27 12:27:46 +0000
committerNicolas Geoffray <ngeoffray@google.com>2015-03-27 12:29:43 +0000
commit572f07c0f819e69d7ff899773598efc00ed594a6 (patch)
tree6ff9a06036c915469c478f8cea7222c6bac7e56e /Android.mk
parentccd8cb0695a1723e5ea7869fc16107b888fbabf7 (diff)
downloadart-572f07c0f819e69d7ff899773598efc00ed594a6.zip
art-572f07c0f819e69d7ff899773598efc00ed594a6.tar.gz
art-572f07c0f819e69d7ff899773598efc00ed594a6.tar.bz2
Update clean-oat-host after latest oat location changes.
oat and odex files are now located in a oat directory. In the process of changing to the new directory, I realized we were also not removing oat files from /system/priv-app. This new rule just removes all oat/art/odex files found under OUT_DIR. bug:19945676 Change-Id: I4d21f3c9428afeacaca9753c21eceb1925ee537c
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk22
1 files changed, 1 insertions, 21 deletions
diff --git a/Android.mk b/Android.mk
index 216e865..9360355 100644
--- a/Android.mk
+++ b/Android.mk
@@ -42,27 +42,7 @@ clean-oat: clean-oat-host clean-oat-target
.PHONY: clean-oat-host
clean-oat-host:
- rm -f $(HOST_CORE_IMG_OUTS)
- rm -f $(HOST_CORE_OAT_OUTS)
- rm -f $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/*.odex
-ifneq ($(HOST_PREFER_32_BIT),true)
- rm -f $(HOST_OUT_JAVA_LIBRARIES)/$(2ND_ART_HOST_ARCH)/*.odex
-endif
- rm -f $(TARGET_CORE_IMG_OUTS)
- rm -f $(TARGET_CORE_OAT_OUTS)
- rm -rf $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)
- rm -f $(TARGET_OUT_UNSTRIPPED)/system/framework/*.odex
- rm -f $(TARGET_OUT_UNSTRIPPED)/system/framework/*/*.oat
- rm -f $(TARGET_OUT_UNSTRIPPED)/system/framework/*/*.art
- rm -f $(TARGET_OUT)/framework/*/*.oat
- rm -f $(TARGET_OUT)/framework/*/*.art
- rm -f $(TARGET_OUT_APPS)/*.odex
- rm -f $(TARGET_OUT_INTERMEDIATES)/JAVA_LIBRARIES/*_intermediates/javalib.odex
- rm -f $(TARGET_OUT_INTERMEDIATES)/APPS/*_intermediates/*.odex
-ifdef TARGET_2ND_ARCH
- rm -f $(2ND_TARGET_OUT_INTERMEDIATES)/JAVA_LIBRARIES/*_intermediates/javalib.odex
- rm -f $(2ND_TARGET_OUT_INTERMEDIATES)/APPS/*_intermediates/*.odex
-endif
+ find $(OUT_DIR) -name "*.oat" -o -name "*.odex" -o -name "*.art" | xargs rm -f
ifneq ($(TMPDIR),)
rm -rf $(TMPDIR)/$(USER)/test-*/dalvik-cache/*
rm -rf $(TMPDIR)/android-data/dalvik-cache/*