aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2019-01-14 14:56:07 -0600
committerElliott Hughes2019-01-14 14:56:07 -0600
commit37ab4e2b2e2ca6c636c6e0c4060d13e19579e27d (patch)
tree3bff6847342cecda2d65e6f2ded7bf1c8cf9838b
parent3ab0ca72b5cc8441ea71c6bb7d8e3799148d4370 (diff)
downloadplatform-build-37ab4e2b2e2ca6c636c6e0c4060d13e19579e27d.tar.gz
platform-build-37ab4e2b2e2ca6c636c6e0c4060d13e19579e27d.tar.xz
platform-build-37ab4e2b2e2ca6c636c6e0c4060d13e19579e27d.zip
Use find(1)'s -exec directly.
toybox xargs doesnt have --no-run-if-empty: xargs: Unknown option no-run-if-empty (see "xargs --help") But we shouldn't need it anyway. Test: make -j32 showcommands dist TARGET_BUILD_APPS='Launcher3 Launcher3Tests' EMMA_INSTRUMENT_STATIC=true TARGET_BUILD_VARIANT=userdebug Change-Id: I72f680c27b58a42b9fb9de1a0bc4187cabcfb516
-rw-r--r--core/jacoco.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jacoco.mk b/core/jacoco.mk
index 6406df45a..148bb045e 100644
--- a/core/jacoco.mk
+++ b/core/jacoco.mk
@@ -51,7 +51,7 @@ $(my_unzipped_timestamp_path): $(LOCAL_FULL_CLASSES_PRE_JACOCO_JAR)
51 -d $(PRIVATE_UNZIPPED_PATH) \ 51 -d $(PRIVATE_UNZIPPED_PATH) \
52 $(PRIVATE_INCLUDE_ARGS) 52 $(PRIVATE_INCLUDE_ARGS)
53 (cd $(PRIVATE_UNZIPPED_PATH) && rm -rf $(PRIVATE_EXCLUDE_ARGS)) 53 (cd $(PRIVATE_UNZIPPED_PATH) && rm -rf $(PRIVATE_EXCLUDE_ARGS))
54 (cd $(PRIVATE_UNZIPPED_PATH) && find -not -name "*.class" -type f | xargs --no-run-if-empty rm) 54 (cd $(PRIVATE_UNZIPPED_PATH) && find -not -name "*.class" -type f -exec rm {} \;)
55 touch $(PRIVATE_UNZIPPED_TIMESTAMP_PATH) 55 touch $(PRIVATE_UNZIPPED_TIMESTAMP_PATH)
56# Unfortunately in the previous task above, 56# Unfortunately in the previous task above,
57# 'rm -rf $(PRIVATE_EXCLUDE_ARGS)' needs to be a separate 57# 'rm -rf $(PRIVATE_EXCLUDE_ARGS)' needs to be a separate