Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37ab4e2b authored by Elliott Hughes's avatar Elliott Hughes
Browse files

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
parent 3ab0ca72

core/jacoco.mk

+1 −1
Original line number Diff line number Diff line
@@ -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