commit 45fe6192e7f0478819c1f218ec5650b846379f49
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Jun 29 08:20:11 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jun 29 08:20:11 2024 +0000
tree 4cd2265daef8f28fc4f1223b30927b3ea83feaeb
parent 1205488d909bd3249a5303e54f98ce2e6d70ca9e
parent c5f7f80416eb9231416dfec03e8d497ceb43c4df

Merge "Replace PRODUCT_COPY_FILES with soong module" into main

target/product/generic_system.mk

diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
index 14efa67..0a09eb1 100644
--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
@@ -120,15 +120,15 @@
     init.zygote64.rc \
     init.zygote64_32.rc
 
+# Support Credential Manager
+PRODUCT_PACKAGES += \
+    android.software.credentials.prebuilt.xml
+
 # Enable dynamic partition size
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
 
 PRODUCT_ENFORCE_RRO_TARGETS := *
 
-# Support Credential Manager
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.software.credentials.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.software.credentials.xml
-
 PRODUCT_NAME := generic_system
 PRODUCT_BRAND := generic