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

Commit c02e0f7a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9 am: 8925166f 

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



Change-Id: I38ee795422205a79eec93a6f55fbb6570e38811f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5325cd5c 8925166f

core/dex_preopt.mk

+2 −0
Original line number Diff line number Diff line
@@ -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