diff options
| author | 2025-02-25 14:01:22 -0800 | |
|---|---|---|
| committer | 2025-02-25 14:01:22 -0800 | |
| commit | bdef4ca92ebe97a01c1ab62c1fbc5840511b838b (patch) | |
| tree | 38655c8ee746acc528bf6b3c3e82b1f0ae7c5be8 | |
| parent | b38ec01fe6e2fb54550a58983081cfd8d23685d9 (diff) | |
| parent | cfec144a574dfc9fdef43c3793246df4da8ee5d3 (diff) | |
Merge "Remove make code that built system_server.zip" into main am: 7effaf8b9f am: cfec144a57
Original change: https://android-review.googlesource.com/c/platform/build/+/3507290
Change-Id: I696e68d8ce12da239f643d55e6d32298f16a3992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/dex_preopt.mk | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 8d5567e6d0..9b5e1dbeeb 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -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 |