From cdf5644268df7a92469bcaccf2ef260c90ec0502 Mon Sep 17 00:00:00 2001 From: Vladimir Chtchetkine Date: Wed, 21 Sep 2011 07:01:34 -0700 Subject: [PATCH] Packages media_profiles.xml file into emulated system image The file is required by the camera framework to properly set it up to work with emulated camera devices. Change-Id: I39686841030d21ef23775972aa4ee0ecd7a91c02 --- target/board/generic/device.mk | 3 ++- target/board/generic_x86/device.mk | 3 ++- target/board/vbox_x86/device.mk | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk index f57a0dca75..8b187d5e17 100644 --- a/target/board/generic/device.mk +++ b/target/board/generic/device.mk @@ -23,7 +23,8 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ - development/data/etc/vold.conf:system/etc/vold.conf + development/data/etc/vold.conf:system/etc/vold.conf \ + development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml \ PRODUCT_PACKAGES := \ audio.primary.goldfish diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk index 0b4dc271c8..1055cbad2e 100644 --- a/target/board/generic_x86/device.mk +++ b/target/board/generic_x86/device.mk @@ -23,4 +23,5 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ - development/data/etc/vold.conf:system/etc/vold.conf + development/data/etc/vold.conf:system/etc/vold.conf \ + development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml \ diff --git a/target/board/vbox_x86/device.mk b/target/board/vbox_x86/device.mk index a028b98e90..a76d8fa60a 100644 --- a/target/board/vbox_x86/device.mk +++ b/target/board/vbox_x86/device.mk @@ -28,6 +28,7 @@ LOCAL_KERNEL := prebuilt/android-x86/kernel/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 \ + development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml \ build/target/board/vbox_x86/init.rc:root/init.rc \ build/target/board/vbox_x86/init.vbox_x86.rc:root/init.vbox_x86.rc \ $(LOCAL_KERNEL):kernel