| commit | fb9d75e7cde3eaa815eb3842a155da521c763c15 | [log] [tgz] |
|---|---|---|
| author | Allen Hair <allenhair@google.com> | Tue Jun 28 17:30:28 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 28 17:30:28 2016 +0000 |
| tree | 09a4fa33b8b08bd5d8f6b365b4181fdd3c9e3c58 | |
| parent | a2ffb20c0680613d61d6822bc717a83c4ac00897 [diff] | |
| parent | 15783f00736899776e749d2ae93140caffa5ec40 [diff] |
Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev am: 15783f0073 Change-Id: Ie9e71eb96ad654fc1d34317177cce8013bc2dcb9
diff --git a/Android.mk b/Android.mk index 27cf90c..9d5fd45 100644 --- a/Android.mk +++ b/Android.mk
@@ -494,6 +494,10 @@ LOCAL_RMTYPEDEFS := true +ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true) +LOCAL_EMMA_INSTRUMENT := true +endif + include $(BUILD_JAVA_LIBRARY) framework_module := $(LOCAL_INSTALLED_MODULE)