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

Commit cc93f0c8 authored by Fredrik Roubert's avatar Fredrik Roubert Committed by Ying Wang
Browse files

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
parent 67c4d916

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,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:=

core/definitions.mk

+3 −1
Original line number Diff line number Diff line
@@ -1785,7 +1785,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

core/host_dalvik_java_library.mk

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

core/java_library.mk

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

	$(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@)

core/package_internal.mk

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