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
diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk
index d2f6310..8c66fc9 100644
--- a/target/board/generic/device.mk
+++ b/target/board/generic/device.mk
@@ -22,7 +22,6 @@
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 \
diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk
index 8d62f4b..050b90d 100644
--- a/target/board/generic_arm64/device.mk
+++ b/target/board/generic_arm64/device.mk
@@ -22,7 +22,6 @@
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 \
diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk
index 7b6fa3c..aaac689 100644
--- a/target/board/generic_x86/device.mk
+++ b/target/board/generic_x86/device.mk
@@ -22,7 +22,6 @@
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 \
diff --git a/target/board/generic_x86_64/device.mk b/target/board/generic_x86_64/device.mk
index 7b6fa3c..aaac689 100755
--- a/target/board/generic_x86_64/device.mk
+++ b/target/board/generic_x86_64/device.mk
@@ -22,7 +22,6 @@
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 \
diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk
index b59f3cc..bda9a42 100644
--- a/target/product/aosp_arm.mk
+++ b/target/product/aosp_arm.mk
@@ -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
diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk
index 129f213..727762a 100644
--- a/target/product/aosp_arm64.mk
+++ b/target/product/aosp_arm64.mk
@@ -15,7 +15,7 @@
#
PRODUCT_PROPERTY_OVERRIDES += \
- rild.libpath=/vendor/lib64/libreference-ril.so
+ vendor.rild.libpath=/vendor/lib64/libreference-ril.so
# This is a build configuration for a full-featured build of the
# Open-Source part of the tree. It's geared toward a US-centric
diff --git a/target/product/aosp_x86.mk b/target/product/aosp_x86.mk
index 315a099..cd099e7 100644
--- a/target/product/aosp_x86.mk
+++ b/target/product/aosp_x86.mk
@@ -15,7 +15,7 @@
#
PRODUCT_PROPERTY_OVERRIDES += \
- rild.libpath=/vendor/lib/libreference-ril.so
+ vendor.rild.libpath=/vendor/lib/libreference-ril.so
# This is a build configuration for a full-featured build of the
# Open-Source part of the tree. It's geared toward a US-centric
diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk
index 84d3863..3686009 100644
--- a/target/product/aosp_x86_64.mk
+++ b/target/product/aosp_x86_64.mk
@@ -15,7 +15,7 @@
#
PRODUCT_PROPERTY_OVERRIDES += \
- rild.libpath=/vendor/lib64/libreference-ril.so
+ vendor.rild.libpath=/vendor/lib64/libreference-ril.so
# This is a build configuration for a full-featured build of the
# Open-Source part of the tree. It's geared toward a US-centric
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 1b5b000..8d5dc09 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -134,6 +134,7 @@
wpa_supplicant \
PRODUCT_COPY_FILES += \
+ device/generic/goldfish/data/etc/apns-conf.xml:data/misc/apns/apns-conf.xml \
device/generic/goldfish/init.ranchu-core.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-core.sh \
device/generic/goldfish/init.ranchu-net.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-net.sh \
device/generic/goldfish/wifi/init.wifi.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.wifi.sh \