Merge "change location of apns-conf.xml and vold.conf" into jb-dev
This commit is contained in:
commit
15d1513674
5 changed files with 8 additions and 8 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in a new issue