summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPraneeth Bajjuri <praneeth@ti.com>2017-10-27 00:20:16 -0500
committerPraneeth Bajjuri <praneeth@ti.com>2017-10-27 00:48:59 -0500
commitb8193243f4da408c93c36f229ccb3b052fe7056c (patch)
tree0f056fc30beaca0ba6973bf0d7430309dbb98110
parentd17349b7c541ecf7c9e476704a31fd4efed2c1f4 (diff)
downloadjacinto6evm-b8193243f4da408c93c36f229ccb3b052fe7056c.tar.gz
jacinto6evm: Remove car configuration
Remove car configuration Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r--BoardConfig.mk3
-rw-r--r--device.mk7
-rw-r--r--full_jacinto6evm.mk2
3 files changed, 3 insertions, 9 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index ce42d02..7a41a03 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -80,8 +80,7 @@ BOARD_SOFTAP_DEVICE := wl12xx_mac80211
endif
BOARD_SEPOLICY_DIRS += \
- device/ti/jacinto6evm/sepolicy \
- packages/services/Car/car_product/sepolicy
+ device/ti/jacinto6evm/sepolicy
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
diff --git a/device.mk b/device.mk
index a8e6a90..da3a3d5 100644
--- a/device.mk
+++ b/device.mk
@@ -57,7 +57,6 @@ PRODUCT_COPY_FILES := \
device/ti/jacinto6evm/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
- frameworks/native/data/etc/android.hardware.type.automotive.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.type.automotive.xml \
frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \
frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \
@@ -85,7 +84,7 @@ PRODUCT_COPY_FILES += \
frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
- frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml
+ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
device/ti/jacinto6evm/audio/primary/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \
device/ti/jacinto6evm/audio/primary/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \
device/ti/jacinto6evm/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml
@@ -167,10 +166,6 @@ PRODUCT_PACKAGES += Launcher3 \
PRODUCT_PROPERTY_OVERRIDES += \
media.aac_51_output_enabled=true
-PRODUCT_PROPERTY_OVERRIDES += \
- android.car.drawer.unlimited=true \
- android.car.hvac.demo=true
-
#$(call inherit-product, frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap.mk)
$(call inherit-product-if-exists, hardware/ti/dra7xx/jacinto6.mk)
#$(call inherit-product-if-exists, hardware/ti/wpan/ti-wpan-products.mk)
diff --git a/full_jacinto6evm.mk b/full_jacinto6evm.mk
index 9823b87..75fcae6 100644
--- a/full_jacinto6evm.mk
+++ b/full_jacinto6evm.mk
@@ -23,7 +23,7 @@
# Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
-$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+# $(call inherit-product, packages/services/Car/car_product/build/car.mk)
$(call inherit-product, device/ti/jacinto6evm/device.mk)
PRODUCT_NAME := full_jacinto6evm