From 0bac88c7f77c059fec85797701e03204d40752ee Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Fri, 3 Jan 2020 14:53:14 +0100 Subject: goldfish: Add PRODUCT_SDK_ADDON_COPY_FILES entries for emulator Those are copied from the 17.0 branch, adapted to the 16.0 file locations. Change-Id: Ic9a08356ab0cd6896bf11d9c77fadef0bd5faa33 --- arm32-vendor.mk | 3 +++ arm64-vendor.mk | 3 +++ x86-vendor.mk | 4 ++++ x86_64-vendor.mk | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/arm32-vendor.mk b/arm32-vendor.mk index 2d10d89..6924a5c 100644 --- a/arm32-vendor.mk +++ b/arm32-vendor.mk @@ -10,5 +10,8 @@ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2:kernel-ranchu-64 \ device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu +PRODUCT_SDK_ADDON_COPY_FILES += \ + development/sys-img/advancedFeatures.ini.arm:images/armeabi-v7a/advancedFeatures.ini \ + prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2:images/armeabi-v7a/kernel-ranchu-64 EMULATOR_VENDOR_NO_GNSS := true diff --git a/arm64-vendor.mk b/arm64-vendor.mk index 12519d7..38b3add 100644 --- a/arm64-vendor.mk +++ b/arm64-vendor.mk @@ -10,5 +10,8 @@ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2:kernel-ranchu \ device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu +PRODUCT_SDK_ADDON_COPY_FILES += \ + development/sys-img/advancedFeatures.ini.arm:images/arm64-v8a/advancedFeatures.ini \ + prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2:images/arm64-v8a/kernel-ranchu EMULATOR_VENDOR_NO_GNSS := true diff --git a/x86-vendor.mk b/x86-vendor.mk index 2ee7f1b..f9e5643 100644 --- a/x86-vendor.mk +++ b/x86-vendor.mk @@ -10,6 +10,10 @@ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ prebuilts/qemu-kernel/x86_64/4.9/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/4.9/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 66d46f9..17374fe 100644 --- a/x86_64-vendor.mk +++ b/x86_64-vendor.mk @@ -10,6 +10,10 @@ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ prebuilts/qemu-kernel/x86_64/4.9/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/4.9/kernel-qemu2:images/x86_64/kernel-ranchu PRODUCT_SHIPPING_API_LEVEL := 28 TARGET_USES_MKE2FS := true -- cgit v1.2.3