Declare inputs of $PRODUCT_OUT/system_server.zip
https://r.android.com/3062109 switched system_server.zip generation to
read the files from an intermediates directory assembled by a soong
singleton, and not from $PRODUCT_OUT. However, it did not update the
inputs. This silently relied on the fact that depending on the system
server jars in PRODUCT_OUT would assemble the jar in the soong
intermediates directory
This CL makes the input explicit.
Bug: 396162261
Test: m $PRODUCT_OUT/system_server.zip
Test: aninja -t query $PRODUCT_OUT/system_server.zip
(verified that out/soong/system_server_dexjars/services.jar is listed in
inputs)
Change-Id: I087597e26562250c9870cf636cd457ad3a1394c8
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 88e0cc7..8d5567e 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -107,7 +107,7 @@
$(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): $(system_server_jars) $(apex_system_server_jars) $(apex_standalone_system_server_jars) $(standalone_system_server_jars) $(SOONG_ZIP)
+$(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 $@ \