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

Commit 2b96d6ae authored by Ian Rogers's avatar Ian Rogers
Browse files

resolved conflicts for merge of 77efd7b4 to master 

Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f
parents 2290cbf8 77efd7b4

target/board/generic_x86_64/device.mk

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ PRODUCT_COPY_FILES := \ 
    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \

    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

    device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \

    system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc



PRODUCT_PACKAGES := \

    audio.primary.goldfish \

target/product/full_x86_64.mk

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
# that isn't a wifi connection. This will instruct init.rc to enable the

# network connection so that you can use it with ADB



# Override and force 64-bit Zygote. Must come first.

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64



$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)