From 3623a6c27532006e23fc68d3cd53965bdd827c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Wed, 23 Aug 2023 20:58:54 +0000 Subject: Remove Coral and Flame car variants. Coral/Flame (Pixel 4) are no longer supported in Android U. Regular products were removed in ag/24476209 Bug: 234559097 Test: presubmit Change-Id: I7ba17d57e20502172331783ce5ca7196bd4ed77c --- AndroidProducts.mk | 4 ---- coral_car/BoardConfig.mk | 26 -------------------------- coral_car/aosp_coral_car.mk | 27 --------------------------- coral_car/device-coral-car.mk | 21 --------------------- flame_car/BoardConfig.mk | 27 --------------------------- flame_car/aosp_flame_car.mk | 28 ---------------------------- flame_car/device-flame-car.mk | 21 --------------------- 7 files changed, 154 deletions(-) delete mode 100644 coral_car/BoardConfig.mk delete mode 100644 coral_car/aosp_coral_car.mk delete mode 100644 coral_car/device-coral-car.mk delete mode 100644 flame_car/BoardConfig.mk delete mode 100644 flame_car/aosp_flame_car.mk delete mode 100644 flame_car/device-flame-car.mk diff --git a/AndroidProducts.mk b/AndroidProducts.mk index ebdd5cd..58bee88 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -18,8 +18,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/bluejay_car/aosp_bluejay_car.mk \ $(LOCAL_DIR)/bramble_car/aosp_bramble_car.mk \ $(LOCAL_DIR)/cheetah_car/aosp_cheetah_car.mk \ - $(LOCAL_DIR)/coral_car/aosp_coral_car.mk \ - $(LOCAL_DIR)/flame_car/aosp_flame_car.mk \ $(LOCAL_DIR)/oriole_car/aosp_oriole_car.mk \ $(LOCAL_DIR)/panther_car/aosp_panther_car.mk \ $(LOCAL_DIR)/raven_car/aosp_raven_car.mk \ @@ -32,8 +30,6 @@ COMMON_LUNCH_CHOICES := \ aosp_bluejay_car-userdebug \ aosp_bramble_car-userdebug \ aosp_cheetah_car-userdebug \ - aosp_coral_car-userdebug \ - aosp_flame_car-userdebug \ aosp_oriole_car-userdebug \ aosp_panther_car-userdebug \ aosp_raven_car-userdebug \ diff --git a/coral_car/BoardConfig.mk b/coral_car/BoardConfig.mk deleted file mode 100644 index 5978b7d..0000000 --- a/coral_car/BoardConfig.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2020 The Android Open-Source 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. -# - -# Contents of this file were copied from device/google/coral/coral/BoardConfig.mk, -# except for: -# -# * TARGET_SCREEN_DENSITY is scaled down by 1.75x - -TARGET_BOOTLOADER_BOARD_NAME := coral -TARGET_SCREEN_DENSITY := 320 -TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165 - -include device/google/coral/BoardConfig-common.mk diff --git a/coral_car/aosp_coral_car.mk b/coral_car/aosp_coral_car.mk deleted file mode 100644 index 130bff2..0000000 --- a/coral_car/aosp_coral_car.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2019 The Android Open Source 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/google_car/common/pre_google_car.mk) -$(call inherit-product, device/google_car/coral_car/device-coral-car.mk) -$(call inherit-product-if-exists, vendor/google_devices/coral/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/coral/prebuilts/device-vendor-coral.mk) -$(call inherit-product, device/google_car/common/post_google_car.mk) - -PRODUCT_MANUFACTURER := Google -PRODUCT_BRAND := Android -PRODUCT_NAME := aosp_coral_car -PRODUCT_DEVICE := coral -PRODUCT_MODEL := AOSP on coral diff --git a/coral_car/device-coral-car.mk b/coral_car/device-coral-car.mk deleted file mode 100644 index e43eb0a..0000000 --- a/coral_car/device-coral-car.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright 2019 The Android Open Source 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. -# - -AUTOMOTIVE_PRODUCT_PATH := google_car/coral_car - -$(call inherit-product, packages/services/Car/car_product/build/car.mk) - -$(call inherit-product, device/google/coral/device-coral.mk) diff --git a/flame_car/BoardConfig.mk b/flame_car/BoardConfig.mk deleted file mode 100644 index 22e8ca4..0000000 --- a/flame_car/BoardConfig.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (C) 2020 The Android Open-Source 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. -# - -# Contents of this file were copied from device/google/coral/flame/BoardConfig.mk, -# except for: -# -# * TARGET_SCREEN_DENSITY is scaled down by 1.75x - - -TARGET_BOOTLOADER_BOARD_NAME := flame -TARGET_SCREEN_DENSITY := 250 -TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165 - -include device/google/coral/BoardConfig-common.mk diff --git a/flame_car/aosp_flame_car.mk b/flame_car/aosp_flame_car.mk deleted file mode 100644 index 6c2cd0f..0000000 --- a/flame_car/aosp_flame_car.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright 2020 The Android Open Source 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/google_car/common/pre_google_car.mk) -$(call inherit-product, device/google_car/flame_car/device-flame-car.mk) -$(call inherit-product, device/google_car/common/post_google_car.mk) - -$(call inherit-product-if-exists, vendor/google_devices/coral/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/coral/prebuilts/device-vendor-flame.mk) - -PRODUCT_MANUFACTURER := Google -PRODUCT_BRAND := Android -PRODUCT_NAME := aosp_flame_car -PRODUCT_DEVICE := flame -PRODUCT_MODEL := AOSP on flame diff --git a/flame_car/device-flame-car.mk b/flame_car/device-flame-car.mk deleted file mode 100644 index 29967d2..0000000 --- a/flame_car/device-flame-car.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright 2020 The Android Open Source 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. -# - -AUTOMOTIVE_PRODUCT_PATH := google_car/flame_car - -$(call inherit-product, packages/services/Car/car_product/build/car.mk) - -$(call inherit-product, device/google/coral/device-flame.mk) -- cgit v1.2.3 From 46837fe90b5d024d3661f760504fb68036741639 Mon Sep 17 00:00:00 2001 From: Gaurav Sarode Date: Tue, 15 Aug 2023 14:30:10 -0700 Subject: Add support for new devices bug: 294109255 Test: local build and flash Change-Id: Id939b63804951d12ba0fa17359d7151301e61317 --- common/post_google_car.mk | 11 ++++++++--- common/pre_google_car.mk | 13 ++++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/common/post_google_car.mk b/common/post_google_car.mk index ee1b2e4..beea48c 100644 --- a/common/post_google_car.mk +++ b/common/post_google_car.mk @@ -20,8 +20,13 @@ # Auto modules PRODUCT_PACKAGES += \ - android.hardware.automotive.audiocontrol-service.example \ - android.hardware.automotive.can@1.0-service + android.hardware.automotive.audiocontrol-service.example + +ifneq ($(PIXEL_2023_GEN),) + PRODUCT_PACKAGES += android.hardware.automotive.can +else + PRODUCT_PACKAGES += android.hardware.automotive.can@1.0-service +endif PRODUCT_PACKAGES_DEBUG += \ canhalctrl \ @@ -56,7 +61,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.eab.supported=0 # Explicitly disable support for some Bluetooth profiles included in base phone builds -PRODUCT_PRODUCT_PROPERTIES += \ +PRODUCT_PROPERTY_OVERRIDES += \ bluetooth.profile.asha.central.enabled=false \ bluetooth.profile.a2dp.source.enabled=false \ bluetooth.profile.avrcp.target.enabled=false \ diff --git a/common/pre_google_car.mk b/common/pre_google_car.mk index deb94d3..ca0f30f 100644 --- a/common/pre_google_car.mk +++ b/common/pre_google_car.mk @@ -53,9 +53,16 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # Auto modules -PRODUCT_PACKAGES += \ - android.hardware.broadcastradio@2.0-service \ - android.hardware.automotive.vehicle@2.0-default-service + +ifneq ($(PIXEL_2023_GEN),) + PRODUCT_PACKAGES += \ + android.hardware.broadcastradio \ + android.hardware.automotive.vehicle@V1-default-service +else + PRODUCT_PACKAGES += \ + android.hardware.broadcastradio@2.0-service \ + android.hardware.automotive.vehicle@2.0-default-service +endif # Additional selinux policy BOARD_SEPOLICY_DIRS += device/google_car/common/sepolicy -- cgit v1.2.3 From 3e61b2b9ba81eb7732913258488a21f9778545fb Mon Sep 17 00:00:00 2001 From: Yu Shan Date: Fri, 15 Sep 2023 17:37:25 -0700 Subject: Update default VHAL name to V3. Test: presubmit Bug: 300694866 Change-Id: Ie7ff8bc3cc57a6e98edf05c7ebec30fa85c14ea7 --- common/pre_google_car.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/pre_google_car.mk b/common/pre_google_car.mk index ca0f30f..5c5972f 100644 --- a/common/pre_google_car.mk +++ b/common/pre_google_car.mk @@ -57,7 +57,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) ifneq ($(PIXEL_2023_GEN),) PRODUCT_PACKAGES += \ android.hardware.broadcastradio \ - android.hardware.automotive.vehicle@V1-default-service + android.hardware.automotive.vehicle@V3-default-service else PRODUCT_PACKAGES += \ android.hardware.broadcastradio@2.0-service \ -- cgit v1.2.3 From df5e2f6417d136f631315d2ad4c103d9671cb2ec Mon Sep 17 00:00:00 2001 From: Gaurav Sarode Date: Tue, 19 Sep 2023 15:14:17 -0700 Subject: Add new owners bug: 301150122 Test: local build Change-Id: If4ced636a1366631efbfffb3968209726f368cbb --- OWNERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index fbf399d..bc14dd7 100644 --- a/OWNERS +++ b/OWNERS @@ -1,2 +1,3 @@ sgaurav@google.com -felipeal@google.com +nirajdesai@google.com +chengandrew@google.com -- cgit v1.2.3 From a8d71bbfdcdb6a4303efa80353299368be6597e5 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Wed, 25 Oct 2023 16:54:30 -0600 Subject: Fix lunch choices for git_main We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch Change-Id: Ia2c112e901d75c2fc251817732be63f7b6de9e72 --- AndroidProducts.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index c009393..c37ea7a 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -27,12 +27,12 @@ PRODUCT_MAKEFILES := \ COMMON_LUNCH_CHOICES := \ - aosp_bluejay_car-userdebug \ - aosp_bramble_car-userdebug \ - aosp_cheetah_car-userdebug \ - aosp_oriole_car-userdebug \ - aosp_panther_car-userdebug \ - aosp_raven_car-userdebug \ - aosp_redfin_car-userdebug \ - aosp_sunfish_car-userdebug \ - aosp_tangorpro_car-userdebug + aosp_bluejay_car-trunk_staging-userdebug \ + aosp_bramble_car-trunk_staging-userdebug \ + aosp_cheetah_car-trunk_staging-userdebug \ + aosp_oriole_car-trunk_staging-userdebug \ + aosp_panther_car-trunk_staging-userdebug \ + aosp_raven_car-trunk_staging-userdebug \ + aosp_redfin_car-trunk_staging-userdebug \ + aosp_sunfish_car-trunk_staging-userdebug \ + aosp_tangorpro_car-trunk_staging-userdebug -- cgit v1.2.3 From f9eec74039303209cbc1d9c481f3250c62281d10 Mon Sep 17 00:00:00 2001 From: Gaurav Sarode Date: Fri, 27 Oct 2023 15:58:58 -0700 Subject: Adding calhuang@ as owner Test: local build Change-Id: Ic55b42e453725537e2025addb5608d79dcacc991 --- OWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/OWNERS b/OWNERS index bc14dd7..3d821f6 100644 --- a/OWNERS +++ b/OWNERS @@ -1,3 +1,4 @@ sgaurav@google.com nirajdesai@google.com chengandrew@google.com +calhuang@google.com -- cgit v1.2.3