summaryrefslogtreecommitdiffstats
path: root/core/package_internal.mk
diff options
context:
space:
mode:
authorFredrik Roubert <roubert@google.com>2015-01-28 21:29:38 +0100
committerYing Wang <wangying@android.com>2015-01-29 17:44:27 +0000
commitcc93f0c87cbcd7fa00e8407315c3ee60d24abd85 (patch)
tree1727c047906cec966cbd4c87cf404a98a783ed44 /core/package_internal.mk
parent67c4d916f5294e47e3da275664bb55f4518300f3 (diff)
downloadbuild-cc93f0c87cbcd7fa00e8407315c3ee60d24abd85.zip
build-cc93f0c87cbcd7fa00e8407315c3ee60d24abd85.tar.gz
build-cc93f0c87cbcd7fa00e8407315c3ee60d24abd85.tar.bz2
Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
Normally the build function initialize-package-file will delete all class files and all directory entries from JAR files, but sometimes external projects (eg. ICU4J) depend on having directory entries in their JAR files. This change adds the flag LOCAL_DONT_DELETE_JAR_DIRS (analogous to the flag LOCAL_DONT_DELETE_JAR_META_INF) which when set will skip deletion of directory entries in initialize-package-file. Change-Id: I4464b947b7528fca23925affa95e4071915f04d4
Diffstat (limited to 'core/package_internal.mk')
-rw-r--r--core/package_internal.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk
index 58db27d..49a6d9b 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -388,6 +388,7 @@ else
$(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_PREF_CONFIG := $(PRODUCT_AAPT_PREF_CONFIG)
endif
endif
+$(LOCAL_BUILT_MODULE): PRIVATE_DONT_DELETE_JAR_DIRS := $(LOCAL_DONT_DELETE_JAR_DIRS)
$(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest)
@echo "target Package: $(PRIVATE_MODULE) ($@)"
$(if $(PRIVATE_SOURCE_ARCHIVE),\