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

Commit 63762bdf authored by Bo Hu's avatar Bo Hu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "emulator-gsi-configs" into pi-dev 

* changes:
  Update the rild.libpath to vendor.rild.libpath for aosp_$arch
  emulator:  add missing apns config
parents 52f964de ae665f08

target/board/generic/device.mk

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ PRODUCT_PROPERTY_OVERRIDES := \ 
    ro.ril.gprsclass=10



PRODUCT_COPY_FILES := \

    device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

    device/generic/goldfish/camera/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \

target/board/generic_arm64/device.mk

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ PRODUCT_PROPERTY_OVERRIDES := \ 
    ro.ril.gprsclass=10



PRODUCT_COPY_FILES := \

    device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

    device/generic/goldfish/camera/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \

target/board/generic_x86/device.mk

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ PRODUCT_PROPERTY_OVERRIDES := \ 
    ro.ril.gprsclass=10



PRODUCT_COPY_FILES := \

    device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

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

    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 \

target/board/generic_x86_64/device.mk

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ PRODUCT_PROPERTY_OVERRIDES := \ 
    ro.ril.gprsclass=10



PRODUCT_COPY_FILES := \

    device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

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

    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 \

target/product/aosp_arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#



PRODUCT_PROPERTY_OVERRIDES += \

	rild.libpath=/vendor/lib/libreference-ril.so

	vendor.rild.libpath=/vendor/lib/libreference-ril.so



# Note: the following lines need to stay at the beginning so that it can

# take priority  and override the rules it inherit from other mk files