From 179849ade7e5e61ac68944b54d9f5291aa4812f7 Mon Sep 17 00:00:00 2001 From: bohu Date: Thu, 15 Jun 2017 11:35:39 -0700 Subject: [PATCH] sdk:enable emulator to launch in build environment Recent changes in emulator requires advancedFeatures.ini, encryptionkey.img and new kernels (such as 3.18) at OUT directory so emulator can find them. This CL set those up as part of the build process. Change-Id: Iccaea540b2a27f45fd487dd25408b5d5c047171c Merged-In: Ib3b7c4c48a22cecb44255e643402fd1c37797522 --- target/product/sdk_phone_arm64.mk | 9 +++++++++ target/product/sdk_phone_armv7.mk | 9 +++++++++ target/product/sdk_phone_x86.mk | 4 ++++ target/product/sdk_phone_x86_64.mk | 5 +++++ 4 files changed, 27 insertions(+) diff --git a/target/product/sdk_phone_arm64.mk b/target/product/sdk_phone_arm64.mk index a689475b3..3bab84d45 100644 --- a/target/product/sdk_phone_arm64.mk +++ b/target/product/sdk_phone_arm64.mk @@ -19,6 +19,15 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. +# 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_COPY_FILES += \ + development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ + prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu \ + device/generic/goldfish/fstab.ranchu.arm:root/fstab.ranchu \ + device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early + $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk index ebdd0e7f4..910692f92 100644 --- a/target/product/sdk_phone_armv7.mk +++ b/target/product/sdk_phone_armv7.mk @@ -14,6 +14,15 @@ # limitations under the License. # +# 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_COPY_FILES += \ + development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ + prebuilts/qemu-kernel/arm/3.18/kernel-qemu2:kernel-ranchu \ + device/generic/goldfish/fstab.ranchu.arm:root/fstab.ranchu \ + device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early + $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) # AOSP emulator images build the AOSP messaging app. diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk index 01c2e8339..90f4e164b 100644 --- a/target/product/sdk_phone_x86.mk +++ b/target/product/sdk_phone_x86.mk @@ -18,6 +18,10 @@ # Open-Source part of the tree. It's geared toward a US-centric # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. +PRODUCT_COPY_FILES += \ + development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ + device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ + prebuilts/qemu-kernel/x86/3.18/kernel-qemu2:kernel-ranchu $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index c3bc5e958..63e684337 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.mk @@ -19,6 +19,11 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. +PRODUCT_COPY_FILES += \ + development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ + device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ + prebuilts/qemu-kernel/x86_64/3.18/kernel-qemu2:kernel-ranchu + $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)