commit 29e59184e44d361653e958a42fdbdf96a38cb86f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 06 22:27:44 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 06 22:27:44 2020 +0000
tree 2c497d84df34e3917512e2783737ab6d64a5c3c5
parent f0c7bfa1965279aa6f48e17b097a60abb951380a
parent 58e0f20f853b075378ede26b65642f6e77af6934

Merge "Allow EMMA_INSTRUMENT_FRAMEWORK during ninja" am: a62862bd08 am: 7ef5d07452 am: 58e0f20f85

Change-Id: I76ac1540c702ecaac49d7604033e99abb4d967ac

ui/build/ninja.go

diff --git a/ui/build/ninja.go b/ui/build/ninja.go
index 6775ccf..8c6ebb8 100644
--- a/ui/build/ninja.go
+++ b/ui/build/ninja.go
@@ -114,6 +114,8 @@
 			"TARGET_BUILD_APPS",
 			"TARGET_BUILD_VARIANT",
 			"TARGET_PRODUCT",
+			// b/147197813 - used by art-check-debug-apex-gen
+			"EMMA_INSTRUMENT_FRAMEWORK",
 
 			// Goma -- gomacc may not need all of these
 			"GOMA_DIR",