From fe30957867757d77f649948277f409de31a9425c Mon Sep 17 00:00:00 2001 From: keunyoung Date: Fri, 8 Mar 2013 12:54:36 -0800 Subject: [PATCH] reflect the migration of emulator hal to device/generic/goldfish - no longer need to check the presence as device/generic/goldfish is in PDK Change-Id: I551dd283fb6511d8ebd45a8519f797f8ba2f1a05 --- target/board/generic/device.mk | 4 ++-- target/board/generic_mips/device.mk | 4 ++-- target/board/generic_x86/device.mk | 4 ++-- target/board/vbox_x86/device.mk | 4 ++-- target/product/sdk.mk | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk index 737a60706..b1c4977bb 100644 --- a/target/board/generic/device.mk +++ b/target/board/generic/device.mk @@ -25,8 +25,8 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/generic/goldfish/data/etc/vold.conf:system/etc/vold.conf \ - $(call add-to-product-copy-files-if-exists,development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml) \ - $(call add-to-product-copy-files-if-exists,development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml) \ + device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf PRODUCT_PACKAGES := \ diff --git a/target/board/generic_mips/device.mk b/target/board/generic_mips/device.mk index 8c770b508..fef52ec82 100644 --- a/target/board/generic_mips/device.mk +++ b/target/board/generic_mips/device.mk @@ -25,8 +25,8 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/generic/goldfish/data/etc/vold.conf:system/etc/vold.conf \ - $(call add-to-product-copy-files-if-exists,development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml) \ - $(call add-to-product-copy-files-if-exists,development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml) \ + device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf PRODUCT_PACKAGES := \ diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk index d24f3ac3c..ee13ff30c 100644 --- a/target/board/generic_x86/device.mk +++ b/target/board/generic_x86/device.mk @@ -25,8 +25,8 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ 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 + device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml PRODUCT_PACKAGES := \ audio.primary.goldfish diff --git a/target/board/vbox_x86/device.mk b/target/board/vbox_x86/device.mk index b03cbd3bf..6bb1ea688 100644 --- a/target/board/vbox_x86/device.mk +++ b/target/board/vbox_x86/device.mk @@ -29,8 +29,8 @@ LOCAL_KERNEL := prebuilts/qemu-kernel/x86/kernel-vbox PRODUCT_COPY_FILES := \ 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 \ + device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ system/core/rootdir/init.rc:root/init.rc \ build/target/board/vbox_x86/init.vbox_x86.rc:root/init.vbox_x86.rc \ $(LOCAL_KERNEL):kernel diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 82ed538d8..646881ee1 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -85,8 +85,8 @@ PRODUCT_COPY_FILES := \ 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 \ frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \ - 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 \ + device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ + device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \ frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \