diff options
| author | Ying Wang <wangying@google.com> | 2012-08-21 16:59:01 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-08-22 12:11:01 -0700 |
| commit | af4800c8a6a9266ceb7269bd2c6b0bb2f0965bea (patch) | |
| tree | 571c67540d0168aa90f8eaa1fa1a3e378fc611e6 /core/clear_vars.mk | |
| parent | 4606449a53c1a802ea9db0059c08c95cb020376d (diff) | |
| download | build-af4800c8a6a9266ceb7269bd2c6b0bb2f0965bea.zip build-af4800c8a6a9266ceb7269bd2c6b0bb2f0965bea.tar.gz build-af4800c8a6a9266ceb7269bd2c6b0bb2f0965bea.tar.bz2 | |
Support EMMA_INSTRUMENT in both full and unbundled builds.
Bug: 6987838
- With this change, use "EMMA_INSTRUMENT=true" to enable emma in full or
unbundled build.
- You don't need to add "LOCAL_STATIC_JAVA_LIBRARIES += emma" any more for
unbundled apps.
- Now a single var LOCAL_EMMA_INSTRUMENT replaces the previous
LOCAL_NO_EMMA_INSTRUMENT and LOCAL_NO_EMMA_COMPILE.
- By default, if EMMA_INSTRUMENT is true, emma is enabled for only
non-test apps.
- A new global var EMMA_INSTRUMENT_STATIC. It enables EMMA_INSTRUMENT
and builds emma into apk/jar as static library, instead of using emma
as part of shared library core.jar.
Change-Id: I0aa219e83074879ececc159b5b07c39eb07ccc00
Diffstat (limited to 'core/clear_vars.mk')
| -rw-r--r-- | core/clear_vars.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index a564b3c..a389915 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -98,8 +98,7 @@ LOCAL_CERTIFICATE:= LOCAL_SDK_VERSION:= LOCAL_SDK_RES_VERSION:= LOCAL_NDK_STL_VARIANT:= -LOCAL_NO_EMMA_INSTRUMENT:= -LOCAL_NO_EMMA_COMPILE:= +LOCAL_EMMA_INSTRUMENT:= LOCAL_PROGUARD_ENABLED:= # '',optonly,full,custom,disabled LOCAL_PROGUARD_FLAGS:= LOCAL_PROGUARD_FLAG_FILES:= |