diff options
| author | Ying Wang <wangying@google.com> | 2014-02-10 12:51:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 12:51:36 +0000 |
| commit | a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0 (patch) | |
| tree | 907d7e878b11a0445f49687dc839f8adeb374d8b /core/clear_vars.mk | |
| parent | 2ad7d4df0746e7e16fd3cc39d14fa352801abcae (diff) | |
| parent | 74b71317711fe4bacc6422e45de599fea840f061 (diff) | |
| download | build-a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0.zip build-a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0.tar.gz build-a87489b5c2a8fe32aaf3c7b86e4dd8a2945085a0.tar.bz2 | |
am 74b71317: am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
* commit '74b71317711fe4bacc6422e45de599fea840f061':
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 0aaf0ff..4db9545 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:= |