Commit fb20170c 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.\" into nyc-dev

am: 15783f00

Change-Id: I9439934c0fff5c0e23fe0000252c8781f0540a81

Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -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)