Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev

am: 15783f0073

Change-Id: I9439934c0fff5c0e23fe0000252c8781f0540a81
This commit is contained in:
Allen Hair
2016-06-28 17:30:21 +00:00
committed by android-build-merger

View File

@@ -496,6 +496,10 @@ LOCAL_JACK_FLAGS := --multi-dex native
LOCAL_RMTYPEDEFS := true LOCAL_RMTYPEDEFS := true
ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)
LOCAL_EMMA_INSTRUMENT := true
endif
include $(BUILD_JAVA_LIBRARY) include $(BUILD_JAVA_LIBRARY)
framework_module := $(LOCAL_INSTALLED_MODULE) framework_module := $(LOCAL_INSTALLED_MODULE)