From 8fcf6a484658f047982199c9201b68928fa748e2 Mon Sep 17 00:00:00 2001
From: Jeff Gaston <jeffrygaston@google.com>
Date: Fri, 20 Oct 2017 18:33:14 -0700
Subject: [PATCH] Make Jacoco exclusions relative to the current directory

Test: m EMMA_INSTRUMENT=true
Bug: 68056327
Change-Id: Ia6bf1cf78920107404fed4cbd8259d4442b04755
---
 core/jacoco.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/jacoco.mk b/core/jacoco.mk
index 4533cdf3d..225c2a193 100644
--- a/core/jacoco.mk
+++ b/core/jacoco.mk
@@ -72,7 +72,7 @@ $(my_unzipped_timestamp_path): $(LOCAL_FULL_CLASSES_PRE_JACOCO_JAR)
 	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