diff options
| author | Ying Wang <wangying@google.com> | 2014-02-08 18:37:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-08 18:37:33 +0000 |
| commit | 74b71317711fe4bacc6422e45de599fea840f061 (patch) | |
| tree | 93c847ac15a89779acc65789ed5d71524fe85138 /core/clear_vars.mk | |
| parent | 7495e68a61075ef592aff6f2ba4d1d06fe3fedf4 (diff) | |
| parent | 2d72094f06e3cdfc78a3cfda9163cdb45ea7dbbb (diff) | |
| download | build-74b71317711fe4bacc6422e45de599fea840f061.zip build-74b71317711fe4bacc6422e45de599fea840f061.tar.gz build-74b71317711fe4bacc6422e45de599fea840f061.tar.bz2 | |
am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
* commit '2d72094f06e3cdfc78a3cfda9163cdb45ea7dbbb':
Allow proguarding the main app and the test app in a single run.
Diffstat (limited to 'core/clear_vars.mk')
| -rw-r--r-- | core/clear_vars.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 18a1e91..a131a12 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -105,6 +105,7 @@ LOCAL_EMMA_INSTRUMENT:= LOCAL_PROGUARD_ENABLED:= # '',full,custom,nosystem,disabled,obfuscation,optimization LOCAL_PROGUARD_FLAGS:= LOCAL_PROGUARD_FLAG_FILES:= +LOCAL_TEST_MODULE_TO_PROGUARD_WITH:= LOCAL_EMMA_COVERAGE_FILTER:= LOCAL_WARNINGS_ENABLE:= LOCAL_FULL_MANIFEST_FILE:= |