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

Commit bdef4ca9 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Remove make code that built system_server.zip" into main am: 7effaf8b am: cfec144a 

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



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

core/dex_preopt.mk

+0 −36
Original line number Diff line number Diff line
@@ -82,42 +82,6 @@ $(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_dex2oat_dir := $(SOONG_OUT_DIR)/system_server_dexjars

system_server_zip := $(PRODUCT_OUT)/system_server.zip

# non_updatable_system_server_jars contains jars in /system and /system_ext that are not part of an apex.

non_updatable_system_server_jars := \

  $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),\

    $(system_server_dex2oat_dir)/$(call word-colon,2,$(m)).jar)



apex_system_server_jars := \

  $(foreach m,$(PRODUCT_APEX_SYSTEM_SERVER_JARS),\

    $(system_server_dex2oat_dir)/$(call word-colon,2,$(m)).jar)



apex_standalone_system_server_jars := \

  $(foreach m,$(PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS),\

    $(system_server_dex2oat_dir)/$(call word-colon,2,$(m)).jar)



standalone_system_server_jars := \

  $(foreach m,$(PRODUCT_STANDALONE_SYSTEM_SERVER_JARS),\

    $(system_server_dex2oat_dir)/$(call word-colon,2,$(m)).jar)



$(system_server_zip): PRIVATE_SYSTEM_SERVER_DEX2OAT_DIR := $(system_server_dex2oat_dir)

$(system_server_zip): PRIVATE_SYSTEM_SERVER_JARS := $(non_updatable_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): $(non_updatable_system_server_jars) $(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 $(PRIVATE_SYSTEM_SERVER_DEX2OAT_DIR) $(addprefix -f ,$(PRIVATE_SYSTEM_SERVER_JARS)) \

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

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

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



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



endif  #PRODUCT_USES_DEFAULT_ART_CONFIG

endif  #WITH_DEXPREOPT_ART_BOOT_IMG_ONLY

endif  #WITH_DEXPREOPT