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

Commit a95fbd1e authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

Add a product variable for priv-apps dependencies. 

Those dependencies are jars/apks on which we want to
uncompress their dexs.

bug: 30972906
bug: 63920015

Test: sailfish build

Change-Id: Ic96ffe9dbe39abc1c28e7de134892d689207c9ca
parent 03e8fb10

core/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -40,7 +40,9 @@ $(foreach cf,$(unique_product_copy_files_pairs), \ 
        $(eval _fulldest := $(call append-path,$(PRODUCT_OUT),$(_dest))) \

        $(if $(filter %.xml,$(_dest)),\

            $(eval $(call copy-xml-file-checked,$(_src),$(_fulldest))),\

            $(eval $(call copy-one-file,$(_src),$(_fulldest)))) \

            $(if $(and $(filter %.jar,$(_dest)),$(filter $(basename $(notdir $(_dest))),$(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))),\

                $(eval $(call copy-and-uncompress-dexs,$(_src),$(_fulldest))), \

                $(eval $(call copy-one-file,$(_src),$(_fulldest))))) \

        $(eval ALL_DEFAULT_INSTALLED_MODULES += $(_fulldest)) \

        $(eval unique_product_copy_files_destinations += $(_dest))))

unique_product_copy_files_pairs :=

core/definitions.mk

+8 −0
Original line number Diff line number Diff line
@@ -2599,6 +2599,14 @@ $(2): $(1) 
	$$(copy-file-to-target)

endef



define copy-and-uncompress-dexs

$(2): $(1) $(ZIPALIGN)

	@echo "Uncompress dexs in: $$@"

	$$(copy-file-to-target)

	$$(uncompress-dexs)

	$$(align-package)

endef



# Copies many files.

# $(1): The files to copy.  Each entry is a ':' separated src:dst pair

# Evaluates to the list of the dst files (ie suitable for a dependency list)

core/java_library.mk

+5 −1
Original line number Diff line number Diff line
@@ -63,12 +63,16 @@ 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)

$(common_javalib.jar) : $(built_dex) $(java_resource_sources) | $(ZIPTIME) $(ZIPALIGN)

	@echo "target Jar: $(PRIVATE_MODULE) ($@)"

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

	$(call add-dex-to-package-arg,$@.tmp)

	$(hide) $(ZIPTIME) $@.tmp

	$(call commit-change-for-toc,$@)

ifneq (,$(filter $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES), $(LOCAL_MODULE)))

	$(uncompress-dexs)

	$(align-package)

endif  # PRODUCT_LOADED_BY_PRIVILEGED_MODULES



.KATI_RESTAT: $(common_javalib.jar)

core/package_internal.mk

+4 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ $(LOCAL_BUILT_MODULE): PRIVATE_RES_PACKAGE := $(my_res_package) 
$(LOCAL_BUILT_MODULE) : $(my_res_package) $(AAPT2) | $(ACP)

else

$(LOCAL_BUILT_MODULE): PRIVATE_RESOURCE_LIST := $(all_res_assets)

$(LOCAL_BUILT_MODULE) : $(all_res_assets) $(full_android_manifest) $(AAPT)

$(LOCAL_BUILT_MODULE) : $(all_res_assets) $(full_android_manifest) $(AAPT) $(ZIPALIGN)

endif

	@echo "target Package: $(PRIVATE_MODULE) ($@)"

ifdef LOCAL_USE_AAPT2
@@ -584,6 +584,9 @@ ifneq (nostripping,$(LOCAL_DEX_PREOPT)) 
	$(call dexpreopt-remove-classes.dex,$@)

endif

endif

ifneq (,$(filter $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES), $(LOCAL_MODULE)))

	$(uncompress-dexs)

endif  # PRODUCT_LOADED_BY_PRIVILEGED_MODULES

	$(sign-package)



###############################

core/prebuilt_internal.mk

+4 −0
Original line number Diff line number Diff line
@@ -344,6 +344,10 @@ $(built_module) : $(my_prebuilt_src_file) | $(ZIPALIGN) $(SIGNAPK_JAR) 
ifneq (true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS))

ifeq (true,$(LOCAL_PRIVILEGED_MODULE))

	$(uncompress-dexs)

else

  ifneq (,$(filter $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES), $(LOCAL_MODULE)))

	  $(uncompress-dexs)

  endif  # PRODUCT_LOADED_BY_PRIVILEGED_MODULES

endif  # LOCAL_PRIVILEGED_MODULE

endif  # DONT_UNCOMPRESS_PRIV_APPS_DEXS

ifdef LOCAL_DEX_PREOPT