Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d3f581d authored by David 'Digit' Turner's avatar David 'Digit' Turner
Browse files

resolved conflicts for merge of 7a58de4e to lmp-dev-plus-aosp 

Change-Id: I74491684909c34022c20932e1acd57887b1f0c15
parents 3cff4f39 7a58de4e

target/board/generic_arm64/device.mk

+10 −0
Original line number Diff line number Diff line
@@ -30,6 +30,16 @@ PRODUCT_COPY_FILES := \ 
    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.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)

target/product/aosp_arm64.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

target/product/sdk_phone_arm64.mk

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


$(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)



# Overrides

PRODUCT_BRAND := generic_arm64