From 405b30fb4f9ca6e84ef47165ecc745df0d71b4c2 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 14 Sep 2018 14:12:59 -0700 Subject: [PATCH] Remove LOCAL_DONT_DELETE_JAR_DIRS There are no users left in Make. Test: m checkbuild Change-Id: I896fc6b889aab556c6983c374421e4c5381af54d --- core/definitions.mk | 3 +-- core/host_dalvik_java_library.mk | 1 - core/java_library.mk | 1 - core/package_internal.mk | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index 8393e4cc3..35d70cb0d 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2361,8 +2361,7 @@ endef define initialize-package-file @mkdir -p $(dir $(2)) $(hide) cp -f $(1) $(2) -$(hide) zip -qd $(2) "*.class" \ - $(if $(strip $(PRIVATE_DONT_DELETE_JAR_DIRS)),,"*/") \ +$(hide) zip -qd $(2) "*.class" "*/" \ || true # Ignore the error when nothing to delete. endef diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk index d35f39da9..779cef950 100644 --- a/core/host_dalvik_java_library.mk +++ b/core/host_dalvik_java_library.mk @@ -171,7 +171,6 @@ $(built_dex): $(full_classes_jar) $(DX) $(ZIP2ZIP) $(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 9a7422d72..0a70a3817 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -65,7 +65,6 @@ else # !LOCAL_IS_STATIC_JAVA_LIBRARY $(common_javalib.jar): PRIVATE_DEX_FILE := $(built_dex) $(common_javalib.jar): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar) -$(common_javalib.jar): PRIVATE_DONT_DELETE_JAR_DIRS := $(LOCAL_DONT_DELETE_JAR_DIRS) $(common_javalib.jar) : $(built_dex) $(java_resource_sources) | $(ZIPTIME) $(ZIPALIGN) @echo "target Jar: $(PRIVATE_MODULE) ($@)" $(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@.tmp) diff --git a/core/package_internal.mk b/core/package_internal.mk index 0208288b1..7f74cc903 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -608,7 +608,6 @@ $(LOCAL_BUILT_MODULE) : $(call intermediates-dir-for,PACKAGING,veridex,HOST)/ver $(LOCAL_BUILT_MODULE): PRIVATE_INSTALLED_MODULE := $(LOCAL_INSTALLED_MODULE) endif -$(LOCAL_BUILT_MODULE): PRIVATE_DONT_DELETE_JAR_DIRS := $(LOCAL_DONT_DELETE_JAR_DIRS) $(LOCAL_BUILT_MODULE): PRIVATE_RESOURCE_INTERMEDIATES_DIR := $(intermediates.COMMON)/resources $(LOCAL_BUILT_MODULE): PRIVATE_FULL_CLASSES_JAR := $(full_classes_jar) $(LOCAL_BUILT_MODULE) : $(jni_shared_libraries)