Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f583f1e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove LOCAL_DONT_DELETE_JAR_DIRS"

parents 79b9c20c 405b30fb

core/definitions.mk

+1 −2
Original line number Diff line number Diff line
@@ -2326,8 +2326,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

core/host_dalvik_java_library.mk

+0 −1
Original line number Diff line number Diff line
@@ -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),$@)

core/java_library.mk

+0 −1
Original line number Diff line number Diff line
@@ -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)

core/package_internal.mk

+0 −1
Original line number Diff line number Diff line
@@ -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)