From 37ab4e2b2e2ca6c636c6e0c4060d13e19579e27d Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 14 Jan 2019 12:56:07 -0800 Subject: [PATCH] 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 --- core/jacoco.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/jacoco.mk b/core/jacoco.mk index 6406df45a3..148bb045ec 100644 --- a/core/jacoco.mk +++ b/core/jacoco.mk @@ -51,7 +51,7 @@ $(my_unzipped_timestamp_path): $(LOCAL_FULL_CLASSES_PRE_JACOCO_JAR) -d $(PRIVATE_UNZIPPED_PATH) \ $(PRIVATE_INCLUDE_ARGS) (cd $(PRIVATE_UNZIPPED_PATH) && rm -rf $(PRIVATE_EXCLUDE_ARGS)) - (cd $(PRIVATE_UNZIPPED_PATH) && find -not -name "*.class" -type f | xargs --no-run-if-empty rm) + (cd $(PRIVATE_UNZIPPED_PATH) && find -not -name "*.class" -type f -exec rm {} \;) touch $(PRIVATE_UNZIPPED_TIMESTAMP_PATH) # Unfortunately in the previous task above, # 'rm -rf $(PRIVATE_EXCLUDE_ARGS)' needs to be a separate