diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-08-20 17:39:00 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-08-22 11:15:01 +0200 |
| commit | d3e8cb7fdabb2fc9c62e2aaa873c19eebf62d9aa (patch) | |
| tree | e60219a6b28f1f92c6a749f58bdbd6c2f665a43b /target/board | |
| parent | ce9b58b1e432f834e00e84592576f69923781dad (diff) | |
| download | build-d3e8cb7fdabb2fc9c62e2aaa873c19eebf62d9aa.zip build-d3e8cb7fdabb2fc9c62e2aaa873c19eebf62d9aa.tar.gz build-d3e8cb7fdabb2fc9c62e2aaa873c19eebf62d9aa.tar.bz2 | |
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
Diffstat (limited to 'target/board')
| -rw-r--r-- | target/board/generic_arm64/device.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 354fb2a..733c83c 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) |