Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe309578 authored Mar 08, 2013 by keunyoung

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

parent a8d89e15

target/board/generic/device.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -25,8 +25,8 @@ PRODUCT_PROPERTY_OVERRIDES := \
	PRODUCT_COPY_FILES := \		PRODUCT_COPY_FILES := \
	device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \		device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
	device/generic/goldfish/data/etc/vold.conf:system/etc/vold.conf \		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) \		device/generic/goldfish/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_codecs.xml:system/etc/media_codecs.xml \
	hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf		hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf

	PRODUCT_PACKAGES := \		PRODUCT_PACKAGES := \

target/board/generic_mips/device.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -25,8 +25,8 @@ PRODUCT_PROPERTY_OVERRIDES := \
	PRODUCT_COPY_FILES := \		PRODUCT_COPY_FILES := \
	device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \		device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
	device/generic/goldfish/data/etc/vold.conf:system/etc/vold.conf \		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) \		device/generic/goldfish/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_codecs.xml:system/etc/media_codecs.xml \
	hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf		hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf

	PRODUCT_PACKAGES := \		PRODUCT_PACKAGES := \

target/board/generic_x86/device.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -25,8 +25,8 @@ PRODUCT_PROPERTY_OVERRIDES := \
	PRODUCT_COPY_FILES := \		PRODUCT_COPY_FILES := \
	device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \		device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
	device/generic/goldfish/data/etc/vold.conf:system/etc/vold.conf \		device/generic/goldfish/data/etc/vold.conf:system/etc/vold.conf \
	development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml \		device/generic/goldfish/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_codecs.xml:system/etc/media_codecs.xml

	PRODUCT_PACKAGES := \		PRODUCT_PACKAGES := \
	audio.primary.goldfish		audio.primary.goldfish

target/board/vbox_x86/device.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,8 +29,8 @@ LOCAL_KERNEL := prebuilts/qemu-kernel/x86/kernel-vbox
	PRODUCT_COPY_FILES := \		PRODUCT_COPY_FILES := \
	device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \		device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
	device/generic/goldfish/data/etc/vold.conf:system/etc/vold.conf \		device/generic/goldfish/data/etc/vold.conf:system/etc/vold.conf \
	development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml \		device/generic/goldfish/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_codecs.xml:system/etc/media_codecs.xml \
	system/core/rootdir/init.rc:root/init.rc \		system/core/rootdir/init.rc:root/init.rc \
	build/target/board/vbox_x86/init.vbox_x86.rc:root/init.vbox_x86.rc \		build/target/board/vbox_x86/init.vbox_x86.rc:root/init.vbox_x86.rc \
	$(LOCAL_KERNEL):kernel		$(LOCAL_KERNEL):kernel

target/product/sdk.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
	frameworks/base/data/sounds/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.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 \		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 \		device/generic/goldfish/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_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.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/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 \		frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \