summaryrefslogtreecommitdiffstats
path: root/core/clear_vars.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-08-30 14:16:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-30 14:16:31 -0700
commitfb12f71fe7e94887e7425765a3d869d64516894a (patch)
treeaf07efa4aba7182745eb41ad52b25c9fd6ecf81c /core/clear_vars.mk
parent6306e425690842e3537c7d090654ad892625c379 (diff)
parent18c8d9eb1e0c0776862d554f0834e7ee3018375a (diff)
downloadbuild-fb12f71fe7e94887e7425765a3d869d64516894a.zip
build-fb12f71fe7e94887e7425765a3d869d64516894a.tar.gz
build-fb12f71fe7e94887e7425765a3d869d64516894a.tar.bz2
am 18c8d9eb: am 3a6f7589: Add LOCAL_DONT_DELETE_JAR_META_INF
* commit '18c8d9eb1e0c0776862d554f0834e7ee3018375a': Add LOCAL_DONT_DELETE_JAR_META_INF
Diffstat (limited to 'core/clear_vars.mk')
-rw-r--r--core/clear_vars.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 8e82dc8..3ea83e2 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -126,6 +126,8 @@ LOCAL_ADDRESS_SANITIZER:=
LOCAL_JAR_EXCLUDE_FILES:=
LOCAL_LINT_FLAGS:=
LOCAL_SOURCE_FILES_ALL_GENERATED:= # '',true
+# Don't delete the META_INF dir when merging static Java libraries.
+LOCAL_DONT_DELETE_JAR_META_INF:=
# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
# iterate over thousands of entries every time.