commit 8fcf6a484658f047982199c9201b68928fa748e2
author Jeff Gaston <jeffrygaston@google.com> Fri Oct 20 18:33:14 2017 -0700
committer Jeff Gaston <jeffrygaston@google.com> Tue Oct 24 12:34:38 2017 -0700
tree 094403f9e073c1fdc8813e74eb7e4e675064c1e3
parent b64f70557a4142be2bc748f4ceefa53de3a3dc2a

Make Jacoco exclusions relative to the current directory

Test: m EMMA_INSTRUMENT=true
Bug: 68056327
Change-Id: Ia6bf1cf78920107404fed4cbd8259d4442b04755

core/jacoco.mk

diff --git a/core/jacoco.mk b/core/jacoco.mk
index 4533cdf..225c2a1 100644
--- a/core/jacoco.mk
+++ b/core/jacoco.mk
@@ -72,7 +72,7 @@
 	unzip -q $(PRIVATE_FULL_CLASSES_PRE_JACOCO_JAR) \
 	  -d $(PRIVATE_UNZIPPED_PATH) \
 	  $(PRIVATE_INCLUDE_ARGS)
-	rm -rf $(PRIVATE_EXCLUDE_ARGS)
+	(cd $(PRIVATE_UNZIPPED_PATH) && rm -rf $(PRIVATE_EXCLUDE_ARGS))
 	touch $(PRIVATE_UNZIPPED_TIMESTAMP_PATH)
 # Unfortunately in the previous task above,
 # 'rm -rf $(PRIVATE_EXCLUDE_ARGS)' needs to be a separate