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

Commit e7bafcf3 authored by Islam Elbanna's avatar Islam Elbanna Committed by Automerger Merge Worker
Browse files

Merge "Zip apex system server and standalone system server jars into... 

Merge "Zip apex system server and standalone system server jars into system_server.zip." am: 29c6a750 am: cf9ba27c am: e419095d

Original change: https://android-review.googlesource.com/c/platform/build/+/2281287



Change-Id: If772b69eaaf5d1d38c3d9369abf7a8dfde8fea43
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1b55c3e e419095d

core/dex_preopt.mk

+30 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ ifeq ($(PRODUCT_USES_DEFAULT_ART_CONFIG), true) 


boot_zip := $(PRODUCT_OUT)/boot.zip

bootclasspath_jars := $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES)

# TODO remove system_server_jars usages from boot.zip and depend directly on system_server.zip file.

system_server_jars := \

  $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),\

    $(PRODUCT_OUT)/system/framework/$(call word-colon,2,$(m)).jar)
@@ -79,5 +80,34 @@ $(boot_zip): $(bootclasspath_jars) $(system_server_jars) $(SOONG_ZIP) $(MERGE_ZI 


$(call dist-for-goals, droidcore, $(boot_zip))



# Build the system_server.zip which contains the Apex system server jars and standalone system server jars

system_server_zip := $(PRODUCT_OUT)/system_server.zip

apex_system_server_jars := \

  $(foreach m,$(PRODUCT_APEX_SYSTEM_SERVER_JARS),\

    $(PRODUCT_OUT)/apex/$(call word-colon,1,$(m))/javalib/$(call word-colon,2,$(m)).jar)



apex_standalone_system_server_jars := \

  $(foreach m,$(PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS),\

    $(PRODUCT_OUT)/apex/$(call word-colon,1,$(m))/javalib/$(call word-colon,2,$(m)).jar)



standalone_system_server_jars := \

  $(foreach m,$(PRODUCT_STANDALONE_SYSTEM_SERVER_JARS),\

    $(PRODUCT_OUT)/apex/$(call word-colon,1,$(m))/javalib/$(call word-colon,2,$(m)).jar)



$(system_server_zip): PRIVATE_SYSTEM_SERVER_JARS := $(system_server_jars)

$(system_server_zip): PRIVATE_APEX_SYSTEM_SERVER_JARS := $(apex_system_server_jars)

$(system_server_zip): PRIVATE_APEX_STANDALONE_SYSTEM_SERVER_JARS := $(apex_standalone_system_server_jars)

$(system_server_zip): PRIVATE_STANDALONE_SYSTEM_SERVER_JARS := $(standalone_system_server_jars)

$(system_server_zip): $(apex_system_server_jars) $(apex_standalone_system_server_jars) $(standalone_system_server_jars) $(SOONG_ZIP)

	@echo "Create system server package: $@"

	rm -f $@

	$(SOONG_ZIP) -o $@ \

	  -C $(PRODUCT_OUT) $(addprefix -f ,$(PRIVATE_SYSTEM_SERVER_JARS)) \

	  -C $(PRODUCT_OUT) $(addprefix -f ,$(PRIVATE_APEX_SYSTEM_SERVER_JARS)) \

          -C $(PRODUCT_OUT) $(addprefix -f ,$(PRIVATE_APEX_STANDALONE_SYSTEM_SERVER_JARS)) \

	  -C $(PRODUCT_OUT) $(addprefix -f ,$(PRIVATE_STANDALONE_SYSTEM_SERVER_JARS))



$(call dist-for-goals, droidcore, $(system_server_zip))



endif  #PRODUCT_USES_DEFAULT_ART_CONFIG

endif  #WITH_DEXPREOPT