diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-08-25 10:19:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-25 10:19:09 +0000 |
| commit | d0015f7173d4bc2962d3c89b945e9c3bce5cb313 (patch) | |
| tree | a5a4fb61f3702b4917080d7ab4070ec264fa2d3f | |
| parent | d61f0ffdfc13ce7b563015ea5fdd4513fb7c9d59 (diff) | |
| parent | 46299f5efd8a4a7fc2f9ba89b87a4df8144334a8 (diff) | |
| download | build-d0015f7173d4bc2962d3c89b945e9c3bce5cb313.tar.gz | |
Merge changes I152eb090,Ic40360bf
* changes:
arm64: Fix the sdk_arm64 build products
arm64: Fix aosp_arm64 system image.
| -rw-r--r-- | target/board/generic_arm64/device.mk | 10 | ||||
| -rw-r--r-- | target/product/aosp_arm64.mk | 2 | ||||
| -rw-r--r-- | target/product/sdk_arm64.mk | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 354fb2a7f9..733c83c5a4 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 e1194661bb..ea8ec06eb4 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 diff --git a/target/product/sdk_arm64.mk b/target/product/sdk_arm64.mk index 9aa58b3a88..d7242079df 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 |