From 1da7219ed1674036455f2865a436c6589cdf01ee Mon Sep 17 00:00:00 2001 From: Pranav Gupta Date: Sat, 18 Mar 2023 07:02:44 +0000 Subject: [PATCH] Disable system_server.zip generation for ART prebuilts system_server.zip does not need to be generated when using the prebuilt mainline modules or if ART_MODULE_BUILD_FROM_SOURCE is false or if MODULE_BUILD_FROM_SOURCE is false Bug: 274051753 Change-Id: Ifc638eb4e14ed9ea078125d1780a02b9de6b9ccc --- core/dex_preopt.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 88ec47ffc4..62c3ba3795 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -93,6 +93,7 @@ $(boot_zip): $(bootclasspath_jars) $(system_server_jars) $(SOONG_ZIP) $(MERGE_ZI $(call dist-for-goals, droidcore, $(boot_zip)) +ifneq (,$(filter true,$(ART_MODULE_BUILD_FROM_SOURCE) $(MODULE_BUILD_FROM_SOURCE))) # 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 := \ @@ -122,5 +123,6 @@ $(system_server_zip): $(system_server_jars) $(apex_system_server_jars) $(apex_st $(call dist-for-goals, droidcore, $(system_server_zip)) +endif #ART_MODULE_BUILD_FROM_SOURCE || MODULE_BUILD_FROM_SOURCE endif #PRODUCT_USES_DEFAULT_ART_CONFIG endif #WITH_DEXPREOPT