summaryrefslogtreecommitdiffstats
path: root/target/board/generic/device.mk
diff options
context:
space:
mode:
authorKeun young Park <keunyoung@google.com>2012-05-30 20:34:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-30 20:34:00 -0700
commit53ba6b22f94c1192541b11ada001b68823b97efa (patch)
treea80fb4442609650e23e7f58c587b1418e9cab99b /target/board/generic/device.mk
parentdd8fe390ae9244398b41d23adfb42dbaa9804599 (diff)
parent15d151367482b6ed47cecf1a578b365b7c6ccab3 (diff)
downloadbuild-53ba6b22f94c1192541b11ada001b68823b97efa.zip
build-53ba6b22f94c1192541b11ada001b68823b97efa.tar.gz
build-53ba6b22f94c1192541b11ada001b68823b97efa.tar.bz2
am 15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
* commit '15d151367482b6ed47cecf1a578b365b7c6ccab3': change location of apns-conf.xml and vold.conf
Diffstat (limited to 'target/board/generic/device.mk')
-rw-r--r--target/board/generic/device.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk
index f8e5162..843f038 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