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

Commit 15d15136 authored by Keun young Park's avatar Keun young Park Committed by Android (Google) Code Review
Browse files

Merge "change location of apns-conf.xml and vold.conf" into jb-dev

parents 36e4e050 e581d866

target/board/generic/device.mk

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ PRODUCT_PROPERTY_OVERRIDES := \ 
    ro.adb.qemud=1



PRODUCT_COPY_FILES := \

    development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

    development/data/etc/vold.conf:system/etc/vold.conf \

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

    device/generic/goldfish/data/etc/vold.conf:system/etc/vold.conf \

    development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml \

    development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml \

    hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf

target/board/generic_x86/device.mk

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ PRODUCT_PROPERTY_OVERRIDES := \ 
    ro.adb.qemud=1



PRODUCT_COPY_FILES := \

    development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

    development/data/etc/vold.conf:system/etc/vold.conf \

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

    device/generic/goldfish/data/etc/vold.conf:system/etc/vold.conf \

    development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml \

    development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml

target/board/vbox_x86/device.mk

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ PRODUCT_PROPERTY_OVERRIDES := \ 
LOCAL_KERNEL := prebuilts/qemu-kernel/x86/kernel-vbox



PRODUCT_COPY_FILES := \

    development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

    development/data/etc/vold.conf:system/etc/vold.conf \

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

    device/generic/goldfish/data/etc/vold.conf:system/etc/vold.conf \

    development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml \

    development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml \

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

target/product/full_base_telephony.mk

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ PRODUCT_PROPERTY_OVERRIDES := \ 
    ro.com.android.dataroaming=true



PRODUCT_COPY_FILES := \

    development/data/etc/apns-conf.xml:system/etc/apns-conf.xml

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



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

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

target/product/sdk.mk

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay



PRODUCT_COPY_FILES := \

	development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

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

	system/core/rootdir/etc/vold.fstab:system/etc/vold.fstab \

	frameworks/base/data/sounds/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \

	frameworks/base/data/sounds/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \