summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Allen Hair <allenhair@google.com> 2016-06-28 17:30:21 +0000
committer android-build-merger <android-build-merger@google.com> 2016-06-28 17:30:21 +0000
commitfb20170c0fae7ff17573b45c944a844cf1269929 (patch)
treeefd4c8022370b2cfb326ad8251bb6c6bfccdec3f
parent82bd5246e70d3561fb4991a1a21bb0d884e3096a (diff)
parent15783f00736899776e749d2ae93140caffa5ec40 (diff)
Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am: 15783f0073 Change-Id: I9439934c0fff5c0e23fe0000252c8781f0540a81
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 320fe2f2ed17..0b33301ce5ac 100644
--- a/Android.mk
+++ b/Android.mk
@@ -496,6 +496,10 @@ LOCAL_JACK_FLAGS := --multi-dex native
LOCAL_RMTYPEDEFS := true
+ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)
+LOCAL_EMMA_INSTRUMENT := true
+endif
+
include $(BUILD_JAVA_LIBRARY)
framework_module := $(LOCAL_INSTALLED_MODULE)