From d3e8cb7fdabb2fc9c62e2aaa873c19eebf62d9aa Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Wed, 20 Aug 2014 17:39:00 +0200 Subject: [PATCH 1/2] arm64: Fix aosp_arm64 system image. This patch ensures that the system image produced for the 'aosp_arm64' build products can actually run under emulation with the new qemu-android binaries [1] The main issue is that the virtual board is named 'ranchu' instead of 'goldfish' (because the virtual hardware is _very_ different), and thus requires specific files for the boot to start properly (in particular fstab.ranchu is required to mount the system, data and cache partitions, otherwise init will fail badly because /system/bin/ and /data/ are missing important files). IMPORTANT: This requires the files under device/generic/goldfish/ from: https://android-review.googlesource.com/#/c/105020/ [1] Binaries built from https://qemu-android.googlesource.com/qemu-android BUG=17154406 Change-Id: Ic40360bf56e32aab708551c810000467d23793d4 --- target/board/generic_arm64/device.mk | 10 ++++++++++ target/product/aosp_arm64.mk | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 354fb2a7f..733c83c5a 100644 --- a/target/board/generic_arm64/device.mk +++ b/target/board/generic_arm64/device.mk @@ -27,6 +27,16 @@ PRODUCT_COPY_FILES := \ device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml +# The ranchu configuration files are needed to run under qemu-android +PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ + device/generic/goldfish/init.ranchu.rc:root/init.ranchu.rc \ + device/generic/goldfish/fstab.ranchu:root/fstab.ranchu \ + device/generic/goldfish/ueventd.ranchu.rc:root/ueventd.ranchu.rc) + PRODUCT_PACKAGES := \ audio.primary.goldfish \ vibrator.goldfish + +# Adjust the Dalvik heap to be appropriate for a tablet. +$(call inherit-product-if-exists, frameworks/base/build/tablet-dalvik-heap.mk) +$(call inherit-product-if-exists, frameworks/native/build/tablet-dalvik-heap.mk) diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index e1194661b..ea8ec06eb 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -23,8 +23,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) -PRODUCT_RUNTIMES := runtime_libart_default - include $(SRC_TARGET_DIR)/product/emulator.mk PRODUCT_NAME := aosp_arm64 PRODUCT_DEVICE := generic_arm64 From 46299f5efd8a4a7fc2f9ba89b87a4df8144334a8 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Wed, 20 Aug 2014 17:42:08 +0200 Subject: [PATCH 2/2] arm64: Fix the sdk_arm64 build products This patch fixes the sdk_arm64 system images to boot properly when run under emulation with the new qemu-android binaries. BUG=17154406 Change-Id: I152eb09086ce4abc4b623e54de78cdaaac6b90a1 --- target/product/sdk_arm64.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/sdk_arm64.mk b/target/product/sdk_arm64.mk index 9aa58b3a8..d7242079d 100644 --- a/target/product/sdk_arm64.mk +++ b/target/product/sdk_arm64.mk @@ -21,6 +21,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) # Overrides PRODUCT_BRAND := generic_arm64