From c1f7f3e67785378ce433f5d1891cac5edf989aa1 Mon Sep 17 00:00:00 2001 From: Konsta Date: Fri, 13 Oct 2023 19:50:39 +0300 Subject: [PATCH] car: reorganize makefile --- aosp_rpi4_car.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/aosp_rpi4_car.mk b/aosp_rpi4_car.mk index 7777321..4f1c777 100644 --- a/aosp_rpi4_car.mk +++ b/aosp_rpi4_car.mk @@ -13,17 +13,6 @@ PRODUCT_CHARACTERISTICS := automotive,nosdcard $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) $(call inherit-product, packages/services/Car/car_product/build/car.mk) -# Android Automotive -PRODUCT_PACKAGES += \ - android.hardware.automotive.vehicle@2.0-default-service - -# Broadcast radio -PRODUCT_PACKAGES += \ - android.hardware.broadcastradio-service.default - -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.broadcastradio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.broadcastradio.xml - # Bluetooth PRODUCT_VENDOR_PROPERTIES += \ bluetooth.device.class_of_device=38,4,8 \ @@ -46,6 +35,13 @@ PRODUCT_VENDOR_PROPERTIES += \ bluetooth.profile.sap.server.enabled=false \ bluetooth.profile.vcp.controller.enabled=false +# Broadcast radio +PRODUCT_PACKAGES += \ + android.hardware.broadcastradio-service.default + +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.broadcastradio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.broadcastradio.xml + # Camera ENABLE_CAMERA_SERVICE := true @@ -70,6 +66,10 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.activities_on_secondary_displays.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.activities_on_secondary_displays.xml \ frameworks/native/data/etc/car_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/car_core_hardware.xml +# Vehicle +PRODUCT_PACKAGES += \ + android.hardware.automotive.vehicle@2.0-default-service + # Device identifier. This must come after all inclusions. PRODUCT_DEVICE := rpi4 PRODUCT_NAME := aosp_rpi4_car