From e581d866fb66fde65f63bbce4bd255400fa1bdb7 Mon Sep 17 00:00:00 2001 From: Keun young Park Date: Wed, 30 May 2012 16:32:30 -0700 Subject: [PATCH] change location of apns-conf.xml and vold.conf - from development/data to device/generic/goldfish/data Change-Id: Iab7ad32b31b64f854412dd3cf23fd244a5306ed9 --- target/board/generic/device.mk | 4 ++-- target/board/generic_x86/device.mk | 4 ++-- target/board/vbox_x86/device.mk | 4 ++-- target/product/full_base_telephony.mk | 2 +- target/product/sdk.mk | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk index f8e51628a6..843f03821f 100644 --- a/target/board/generic/device.mk +++ b/target/board/generic/device.mk @@ -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 diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk index 7533a61e78..d24f3ac3cc 100644 --- a/target/board/generic_x86/device.mk +++ b/target/board/generic_x86/device.mk @@ -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 diff --git a/target/board/vbox_x86/device.mk b/target/board/vbox_x86/device.mk index c7cc189ae4..b03cbd3bfb 100644 --- a/target/board/vbox_x86/device.mk +++ b/target/board/vbox_x86/device.mk @@ -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 \ diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk index c376314f13..5899c8ca93 100644 --- a/target/product/full_base_telephony.mk +++ b/target/product/full_base_telephony.mk @@ -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) diff --git a/target/product/sdk.mk b/target/product/sdk.mk index a5d941eab3..8a7e36e358 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.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 \