From 4d09aac1ecf8afcb841273973124a66715c03fa0 Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Mon, 14 Feb 2022 17:38:30 -0500 Subject: [PATCH] lineage: products: Create new Automotive GSI targets * And split out emulator includes as needed to do so. Change-Id: I9a9e02dc9ebf4613bf2da6be9985a8565dac93fc --- build/target/product/AndroidProducts.mk | 4 +++ .../product/lineage_generic_car_target.mk | 1 - build/target/product/lineage_gsi_car_arm64.mk | 29 +++++++++++++++++++ .../target/product/lineage_gsi_car_x86_64.mk | 29 +++++++++++++++++++ build/target/product/lineage_sdk_car_arm64.mk | 4 ++- .../target/product/lineage_sdk_car_x86_64.mk | 4 ++- 6 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 build/target/product/lineage_gsi_car_arm64.mk create mode 100644 build/target/product/lineage_gsi_car_x86_64.mk diff --git a/build/target/product/AndroidProducts.mk b/build/target/product/AndroidProducts.mk index 53af3870..ad56df5e 100644 --- a/build/target/product/AndroidProducts.mk +++ b/build/target/product/AndroidProducts.mk @@ -19,6 +19,8 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/lineage_gsi_arm64.mk \ $(LOCAL_DIR)/lineage_gsi_x86.mk \ $(LOCAL_DIR)/lineage_gsi_x86_64.mk \ + $(LOCAL_DIR)/lineage_gsi_car_arm64.mk \ + $(LOCAL_DIR)/lineage_gsi_car_x86_64.mk \ $(LOCAL_DIR)/lineage_tv_arm.mk \ $(LOCAL_DIR)/lineage_tv_arm64.mk \ $(LOCAL_DIR)/lineage_tv_x86.mk \ @@ -35,6 +37,8 @@ COMMON_LUNCH_CHOICES := \ lineage_gsi_arm64-userdebug \ lineage_gsi_x86-userdebug \ lineage_gsi_x86_64-userdebug \ + lineage_gsi_car_arm64-userdebug \ + lineage_gsi_car_x86_64-userdebug \ lineage_tv_arm-userdebug \ lineage_tv_arm64-userdebug \ lineage_tv_x86-userdebug \ diff --git a/build/target/product/lineage_generic_car_target.mk b/build/target/product/lineage_generic_car_target.mk index 60bb2da7..78a46f6c 100644 --- a/build/target/product/lineage_generic_car_target.mk +++ b/build/target/product/lineage_generic_car_target.mk @@ -13,7 +13,6 @@ # limitations under the License. $(call inherit-product, vendor/lineage/config/common_car.mk) -$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) EMULATOR_VENDOR_NO_SENSORS := true EMULATOR_VENDOR_NO_SOUND := true diff --git a/build/target/product/lineage_gsi_car_arm64.mk b/build/target/product/lineage_gsi_car_arm64.mk new file mode 100644 index 00000000..95fc4b59 --- /dev/null +++ b/build/target/product/lineage_gsi_car_arm64.mk @@ -0,0 +1,29 @@ +# Copyright (C) 2022 The LineageOS Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +$(call inherit-product, device/generic/car/gsi_car_arm64.mk) + +include vendor/lineage/build/target/product/lineage_generic_car_target.mk + +PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true + +TARGET_NO_KERNEL_OVERRIDE := true + +# Enable mainline checking +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed + +PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ + system/app/Home/Home.apk + +PRODUCT_NAME := lineage_gsi_car_arm64 diff --git a/build/target/product/lineage_gsi_car_x86_64.mk b/build/target/product/lineage_gsi_car_x86_64.mk new file mode 100644 index 00000000..903aabff --- /dev/null +++ b/build/target/product/lineage_gsi_car_x86_64.mk @@ -0,0 +1,29 @@ +# Copyright (C) 2022 The LineageOS Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +$(call inherit-product, device/generic/car/gsi_car_x86_64.mk) + +include vendor/lineage/build/target/product/lineage_generic_car_target.mk + +PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true + +TARGET_NO_KERNEL_OVERRIDE := true + +# Enable mainline checking +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed + +PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ + system/app/Home/Home.apk + +PRODUCT_NAME := lineage_gsi_car_x86_64 diff --git a/build/target/product/lineage_sdk_car_arm64.mk b/build/target/product/lineage_sdk_car_arm64.mk index 7ddae18a..3961eb34 100644 --- a/build/target/product/lineage_sdk_car_arm64.mk +++ b/build/target/product/lineage_sdk_car_arm64.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2020 The LineageOS Project +# Copyright (C) 2018-2022 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,6 +14,8 @@ include vendor/lineage/build/target/product/lineage_generic_car_target.mk +$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) + $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_arm64.mk) TARGET_NO_KERNEL_OVERRIDE := true diff --git a/build/target/product/lineage_sdk_car_x86_64.mk b/build/target/product/lineage_sdk_car_x86_64.mk index fede79ae..8bed57b6 100644 --- a/build/target/product/lineage_sdk_car_x86_64.mk +++ b/build/target/product/lineage_sdk_car_x86_64.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2020 The LineageOS Project +# Copyright (C) 2018-2022 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,6 +14,8 @@ include vendor/lineage/build/target/product/lineage_generic_car_target.mk +$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) + $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_x86_64.mk) PRODUCT_NAME := lineage_sdk_car_x86_64