diff options
| author | Ying Wang <wangying@google.com> | 2012-06-19 14:33:09 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-06-19 14:33:09 -0700 |
| commit | 1cc65fd6eff62bbe0bf99c006398416a142bdbbf (patch) | |
| tree | 22b52ee686ea03615d1bf540d4bd342abc452d42 /core/clear_vars.mk | |
| parent | 07220406d5bcfd59c85ad11b00e2b6eeaeee4e01 (diff) | |
| parent | 9b76c054c6039088d310a82fc0ed33298756c58b (diff) | |
| download | build-1cc65fd6eff62bbe0bf99c006398416a142bdbbf.zip build-1cc65fd6eff62bbe0bf99c006398416a142bdbbf.tar.gz build-1cc65fd6eff62bbe0bf99c006398416a142bdbbf.tar.bz2 | |
resolved conflicts for merge of 9b76c054 to master
Change-Id: I4190ef6895b7ddb27d9a293cbacecdef1f4f20b8
Diffstat (limited to 'core/clear_vars.mk')
| -rw-r--r-- | core/clear_vars.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index ef0b031..8d75138 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -122,9 +122,7 @@ LOCAL_CTS_TEST_PACKAGE:= LOCAL_CTS_TEST_RUNNER:= LOCAL_CLANG:= LOCAL_ADDRESS_SANITIZER:= -# Whether to keep the generated R/Manifest classes when building static Java library -# with Android resource. false(default), or true -LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY:= +LOCAL_JAR_EXCLUDE_FILES:= LOCAL_LINT_FLAGS:= # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to |