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

Commit 36165559 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "move hardware feature definitions"

parents 6217aa86 97e023c6

target/product/sdk.mk

+3 −3
Original line number Diff line number Diff line
@@ -139,11 +139,11 @@ PRODUCT_COPY_FILES := \ 
	system/core/rootdir/etc/vold.fstab:system/etc/vold.fstab \

	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/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 \

	development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml \

	frameworks/base/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \

	frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.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



$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)

$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)