diff options
| author | Ying Wang <wangying@google.com> | 2014-02-08 10:31:36 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-02-08 10:31:46 -0800 |
| commit | 960d919e814726f05ad1a9b82e6a9677f9977f15 (patch) | |
| tree | 6467a4fa91af2edee74930ba37ae77f94409ffdc /core/clear_vars.mk | |
| parent | a6e8c6c1e0f659b3532bd86631104360b54016ea (diff) | |
| parent | 4df82b3e30794a3652a5dda773a74f486fec3325 (diff) | |
| download | build-960d919e814726f05ad1a9b82e6a9677f9977f15.zip build-960d919e814726f05ad1a9b82e6a9677f9977f15.tar.gz build-960d919e814726f05ad1a9b82e6a9677f9977f15.tar.bz2 | |
resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6
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 8863fe6..2419260 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:= |