Commit b81ae490 authored Jun 28, 2016 by Allen Hair Committed by android-build-merger Jun 28, 2016

Merge \\\"Add a flag to enable instrumentation of the framework classes.\\\"...

Merge \\\"Add a flag to enable instrumentation of the framework classes.\\\" into nyc-dev am: 15783f00 am: fb20170c
am: b216e809

Change-Id: Ib7d63464ea7a042ea5461ce62928ceb8a3c01c0b

parents 504d8b2d b216e809

Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -495,6 +495,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)