diff options
| author | Ying Wang <wangying@android.com> | 2015-01-29 18:38:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 18:38:00 +0000 |
| commit | 723db51fdb10f3c691a77148cab49f368ff82310 (patch) | |
| tree | 88a4d9e8d73ef91cdfb561c9b4b9eb4e3d1e122e | |
| parent | 954baa1fff6d8b3a4b4e7292c2faaf440a496671 (diff) | |
| parent | 7c05897b69801e1945889a9b1a89b86bbbbbdd3a (diff) | |
| download | build-723db51fdb10f3c691a77148cab49f368ff82310.zip build-723db51fdb10f3c691a77148cab49f368ff82310.tar.gz build-723db51fdb10f3c691a77148cab49f368ff82310.tar.bz2 | |
am 7c05897b: am e937ac81: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."
* commit '7c05897b69801e1945889a9b1a89b86bbbbbdd3a':
Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/definitions.mk | 4 | ||||
| -rw-r--r-- | core/host_dalvik_java_library.mk | 1 | ||||
| -rw-r--r-- | core/java_library.mk | 1 | ||||
| -rw-r--r-- | core/package_internal.mk | 1 |
5 files changed, 7 insertions, 1 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 6e7b6b1..bc6661e 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -155,6 +155,7 @@ 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:= +LOCAL_DONT_DELETE_JAR_DIRS:= LOCAL_ADDITIONAL_CERTIFICATES:= LOCAL_PREBUILT_MODULE_FILE:= LOCAL_POST_LINK_CMD:= diff --git a/core/definitions.mk b/core/definitions.mk index a44ffdb..56051bc 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1968,7 +1968,9 @@ endef define initialize-package-file @mkdir -p $(dir $(2)) $(hide) cp -f $(1) $(2) -$(hide) zip -qd $(2) "*.class" "*/" || true # Ignore the error when nothing to delete. +$(hide) zip -qd $(2) "*.class" \ + $(if $(strip $(PRIVATE_DONT_DELETE_JAR_DIRS)),,"*/") \ + || true # Ignore the error when nothing to delete. endef #TODO: we kinda want to build different asset packages for diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk index 647289b..9b92df6 100644 --- a/core/host_dalvik_java_library.mk +++ b/core/host_dalvik_java_library.mk @@ -106,6 +106,7 @@ $(built_dex): $(full_classes_jar) $(DX) $(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex) $(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE := $(full_classes_jarjar_jar) +$(LOCAL_BUILT_MODULE): PRIVATE_DONT_DELETE_JAR_DIRS := $(LOCAL_DONT_DELETE_JAR_DIRS) $(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources) @echo "Host Jar: $(PRIVATE_MODULE) ($@)" $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@) diff --git a/core/java_library.mk b/core/java_library.mk index 586172b..8641aad 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -66,6 +66,7 @@ else # !LOCAL_IS_STATIC_JAVA_LIBRARY $(common_javalib.jar): PRIVATE_DEX_FILE := $(built_dex) $(common_javalib.jar): PRIVATE_SOURCE_ARCHIVE := $(full_classes_jarjar_jar) +$(common_javalib.jar): PRIVATE_DONT_DELETE_JAR_DIRS := $(LOCAL_DONT_DELETE_JAR_DIRS) $(common_javalib.jar) : $(built_dex) $(java_resource_sources) @echo "target Jar: $(PRIVATE_MODULE) ($@)" ifeq ($(LOCAL_USE_JACK),true) diff --git a/core/package_internal.mk b/core/package_internal.mk index 059f121..06f0216 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -403,6 +403,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) ($@)" ifeq ($(LOCAL_USE_JACK),true) |