Add PRODUCT_SDKADDON_COPY_FILES to reduce duplication.
This allows removing the same definitions in multiple files that
inherit these.
Bug: 128515898
Test: Built / verified variants still contained files.
Change-Id: Ie7a741d49ed4c1602d3a6e69c54543d9eada33e5
diff --git a/arm32-vendor.mk b/arm32-vendor.mk
index b235ae9..cc2aee9 100644
--- a/arm32-vendor.mk
+++ b/arm32-vendor.mk
@@ -6,6 +6,9 @@
# Note: the following lines need to stay at the beginning so that it can
# take priority and override the rules it inherit from other mk files
# see copy file rules in core/Makefile
+PRODUCT_SDK_ADDON_COPY_FILES += \
+ development/sys-img/advancedFeatures.ini.arm:images/armeabi-v7a/advancedFeatures.ini \
+ prebuilts/qemu-kernel/arm64/$(PRODUCT_KERNEL_VERSION)/kernel-qemu2:images/armeabi-v7a/kernel-ranchu-64
PRODUCT_COPY_FILES += \
device/generic/goldfish/manifest-arm.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \
diff --git a/arm64-vendor.mk b/arm64-vendor.mk
index 2679d61..a579d35 100644
--- a/arm64-vendor.mk
+++ b/arm64-vendor.mk
@@ -6,11 +6,14 @@
# Note: the following lines need to stay at the beginning so that it can
# take priority and override the rules it inherit from other mk files
# see copy file rules in core/Makefile
+PRODUCT_SDK_ADDON_COPY_FILES += \
+ development/sys-img/advancedFeatures.ini.arm:images/arm64-v8a/advancedFeatures.ini \
+ prebuilts/qemu-kernel/arm64/$(PRODUCT_KERNEL_VERSION)/kernel-qemu2:images/arm64-v8a/kernel-ranchu
+
PRODUCT_COPY_FILES += \
device/generic/goldfish/manifest-arm.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \
prebuilts/qemu-kernel/arm64/$(PRODUCT_KERNEL_VERSION)/kernel-qemu2:kernel-ranchu \
device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
-
EMULATOR_VENDOR_NO_GNSS := true
diff --git a/x86-vendor.mk b/x86-vendor.mk
index 9d3a49c..6824b87 100644
--- a/x86-vendor.mk
+++ b/x86-vendor.mk
@@ -11,6 +11,10 @@
development/sys-img/advancedFeatures.ini:advancedFeatures.ini \
device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \
prebuilts/qemu-kernel/x86_64/$(PRODUCT_KERNEL_VERSION)/kernel-qemu2:kernel-ranchu-64
+PRODUCT_SDK_ADDON_COPY_FILES += \
+ development/sys-img/advancedFeatures.ini:images/x86/advancedFeatures.ini \
+ device/generic/goldfish/data/etc/encryptionkey.img:images/x86/encryptionkey.img \
+ prebuilts/qemu-kernel/x86_64/$(PRODUCT_KERNEL_VERSION)/kernel-qemu2:images/x86/kernel-ranchu-64
PRODUCT_SHIPPING_API_LEVEL := 28
TARGET_USES_MKE2FS := true
diff --git a/x86_64-vendor.mk b/x86_64-vendor.mk
index 6bc6459..bab4ae8 100644
--- a/x86_64-vendor.mk
+++ b/x86_64-vendor.mk
@@ -11,6 +11,10 @@
development/sys-img/advancedFeatures.ini:advancedFeatures.ini \
device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \
prebuilts/qemu-kernel/x86_64/$(PRODUCT_KERNEL_VERSION)/kernel-qemu2:kernel-ranchu
+PRODUCT_SDK_ADDON_COPY_FILES += \
+ development/sys-img/advancedFeatures.ini:images/x86_64/advancedFeatures.ini \
+ device/generic/goldfish/data/etc/encryptionkey.img:images/x86_64/encryptionkey.img \
+ prebuilts/qemu-kernel/x86_64/$(PRODUCT_KERNEL_VERSION)/kernel-qemu2:images/x86_64/kernel-ranchu
PRODUCT_SHIPPING_API_LEVEL := 28
TARGET_USES_MKE2FS := true
