summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2014-12-02 09:30:37 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-02 09:30:38 +0000
commit4a95fec33c3822eb6a7b8c6bb8144608ae161f41 (patch)
tree7cf92f3e9016a4bfc1cdf9eb7081a598e495ba62
parent9188062cf4b70b45d2244809f9de8d38abb14b13 (diff)
parent7a064a0758ce6e2fc56fde7481bf7469564becd6 (diff)
downloadtoolchain_jack-4a95fec33c3822eb6a7b8c6bb8144608ae161f41.tar.gz
toolchain_jack-4a95fec33c3822eb6a7b8c6bb8144608ae161f41.tar.bz2
toolchain_jack-4a95fec33c3822eb6a7b8c6bb8144608ae161f41.zip
Merge "Update clean-jack-files to new build rules" into ub-jack
-rw-r--r--jack/Android.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/jack/Android.mk b/jack/Android.mk
index edeb3419..ae4ebd58 100644
--- a/jack/Android.mk
+++ b/jack/Android.mk
@@ -168,11 +168,10 @@ test-jack-unit-all: $(LIB_JACK_UNIT_TESTS) $(LOCAL_PATH)/run-jack-unit-tests $(l
$(hide) cd $(PRIVATE_PATH) && $(PRIVATE_RUN_TESTS) com.android.jack.AllTests
.PHONY: clean-jack-files
-clean-jack-files:
- $(hide) find $(OUT_DIR) -name "*.jayce" | xargs rm -f
- $(hide) for i in `find $(OUT_DIR) -name "*.jar"` ; do ((unzip -l $$i 2> /dev/null | \
- grep -q "\.jayce$$" && rm -f $$i) || continue ) ; done
- @echo "All jack files and archives containing jack files have been removed."
+clean-jack-files: clean-dex-files
+ $(hide) find $(OUT_DIR) -name "*.jack" | xargs rm -f
+ $(hide) find $(OUT_DIR) -type d -name "jack" | xargs rm -rf
+ @echo "All jack files have been removed."
.PHONY: clean-dex-files
clean-dex-files: