summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2017-10-02 16:18:00 -0500
committerPraneeth Bajjuri2017-10-02 17:35:19 -0500
commit33973c13f82372fd2b9c1dc76e9bd374dfd4f147 (patch)
tree711246350b3f45d48b664bec0015a4501228f2e0
parent61f3dc1c4f05d59a695d44b5041ec8b2a88b1802 (diff)
downloaddevice-ti-am57xevm-33973c13f82372fd2b9c1dc76e9bd374dfd4f147.tar.gz
device-ti-am57xevm-33973c13f82372fd2b9c1dc76e9bd374dfd4f147.tar.xz
device-ti-am57xevm-33973c13f82372fd2b9c1dc76e9bd374dfd4f147.zip
Revert "am57xevm: move device specific configs to vendor"
This reverts commit b9d38ffd5e63b4a452ea03338c62ca26b6cd4975. Change-Id: Ib6087d28df644827feadc74f754866794565bf0e Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r--device.mk44
-rw-r--r--init.am57xevmboard.rc2
-rw-r--r--media_profiles.xml (renamed from media_profiles_V1_0.xml)0
3 files changed, 23 insertions, 23 deletions
diff --git a/device.mk b/device.mk
index 0d98320..6bdbb29 100644
--- a/device.mk
+++ b/device.mk
@@ -38,37 +38,37 @@ PRODUCT_PACKAGES += \
38 38
39PRODUCT_COPY_FILES := \ 39PRODUCT_COPY_FILES := \
40 $(LOCAL_KERNEL):kernel \ 40 $(LOCAL_KERNEL):kernel \
41 device/ti/am57xevm/tablet_core_hardware_am57xevm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware_am57xevm.xml \ 41 device/ti/am57xevm/tablet_core_hardware_am57xevm.xml:system/etc/permissions/tablet_core_hardware_am57xevm.xml \
42 device/ti/am57xevm/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \ 42 device/ti/am57xevm/manifest.xml:vendor/manifest.xml \
43 device/ti/am57xevm/init.am57xevmboard.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.am57xevmboard.rc \ 43 device/ti/am57xevm/init.am57xevmboard.rc:vendor/etc/init/hw/init.am57xevmboard.rc \
44 device/ti/am57xevm/init.am57xevmboard.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.am57xevmboard.usb.rc \ 44 device/ti/am57xevm/init.am57xevmboard.usb.rc:vendor/etc/init/hw/init.am57xevmboard.usb.rc \
45 device/ti/am57xevm/ueventd.am57xevmboard.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ 45 device/ti/am57xevm/ueventd.am57xevmboard.rc:vendor/ueventd.rc \
46 device/ti/am57xevm/fstab.am57xevmboard:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.am57xevmboard \ 46 device/ti/am57xevm/fstab.am57xevmboard:root/fstab.am57xevmboard \
47 device/ti/am57xevm/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ 47 device/ti/am57xevm/media_profiles.xml:system/etc/media_profiles.xml \
48 device/ti/am57xevm/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ 48 device/ti/am57xevm/media_codecs.xml:system/etc/media_codecs.xml \
49 device/ti/jacinto6evm/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ 49 device/ti/jacinto6evm/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \
50 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ 50 frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
51 frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \ 51 frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
52 frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ 52 frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
53 frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \ 53 frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
54 frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \ 54 frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
55 frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \ 55 frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
56 frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \ 56 frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \
57 frameworks/native/data/etc/android.software.freeform_window_management.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.freeform_window_management.xml \ 57 frameworks/native/data/etc/android.software.freeform_window_management.xml:system/etc/permissions/android.software.freeform_window_management.xml \
58 device/ti/am57xevm/pixcir_tangoc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/pixcir_tangoc.idc \ 58 device/ti/am57xevm/pixcir_tangoc.idc:system/usr/idc/pixcir_tangoc.idc \
59 59
60# These are the hardware-specific features 60# These are the hardware-specific features
61PRODUCT_COPY_FILES += \ 61PRODUCT_COPY_FILES += \
62 frameworks/native/data/etc/android.hardware.camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.xml 62 frameworks/native/data/etc/android.hardware.camera.xml:system/etc/permissions/android.hardware.camera.xml
63 63
64# Audio 64# Audio
65PRODUCT_COPY_FILES += \ 65PRODUCT_COPY_FILES += \
66 device/ti/am57xevm/audio/primary/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ 66 device/ti/am57xevm/audio/primary/mixer_paths.xml:vendor/etc/mixer_paths.xml \
67 device/ti/am57xevm/audio/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf 67 device/ti/am57xevm/audio/audio_policy.conf:vendor/etc/audio_policy.conf
68 68
69# cpuset configuration 69# cpuset configuration
70PRODUCT_COPY_FILES += \ 70PRODUCT_COPY_FILES += \
71 device/ti/am57xevm/init.am57xevmboard.cpuset.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.am57xevmboard.cpuset.sh 71 device/ti/am57xevm/init.am57xevmboard.cpuset.sh:vendor/bin/init.am57xevmboard.cpuset.sh
72 72
73 73
74PRODUCT_PROPERTY_OVERRIDES := \ 74PRODUCT_PROPERTY_OVERRIDES := \
diff --git a/init.am57xevmboard.rc b/init.am57xevmboard.rc
index 9eda199..71f2291 100644
--- a/init.am57xevmboard.rc
+++ b/init.am57xevmboard.rc
@@ -42,7 +42,7 @@ on boot
42 42
43 43
44on fs 44on fs
45 mount_all /vendor/etc/fstab.am57xevmboard 45 mount_all /fstab.am57xevmboard
46 46
47on late-init 47on late-init
48# Load modules 48# Load modules
diff --git a/media_profiles_V1_0.xml b/media_profiles.xml
index 244476d..244476d 100644
--- a/media_profiles_V1_0.xml
+++ b/media_profiles.xml