diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-27 12:29:41 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-05-27 12:29:41 +0100 |
| commit | 7d55bea91fc7ae146ed35cd26683966aa0ef5bfb (patch) | |
| tree | ce654cb33ecc56e3bb3fa0dbb2f29ddd5e97908c /target/board | |
| parent | cc254368412969723cd348a8ee8d8e95a70372fa (diff) | |
| parent | 38c3c9309f12b2c9152bf69848f2f3aeb9832251 (diff) | |
| download | build-7d55bea91fc7ae146ed35cd26683966aa0ef5bfb.zip build-7d55bea91fc7ae146ed35cd26683966aa0ef5bfb.tar.gz build-7d55bea91fc7ae146ed35cd26683966aa0ef5bfb.tar.bz2 | |
resolved conflicts for merge of 38c3c930 to master
Change-Id: I88bb5131ce15bc5a4d7a7870d33c78fc9d952bb2
Diffstat (limited to 'target/board')
| -rwxr-xr-x | target/board/generic_x86_64/device.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target/board/generic_x86_64/device.mk b/target/board/generic_x86_64/device.mk index aa0e5a4..b5b0faf 100755 --- a/target/board/generic_x86_64/device.mk +++ b/target/board/generic_x86_64/device.mk @@ -28,8 +28,7 @@ PRODUCT_COPY_FILES := \ 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 \ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ - device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ - system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc + device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml PRODUCT_PACKAGES := \ audio.primary.goldfish \ |