Merge 24Q3 to AOSP main
Bug: 357762254
Merged-In: I33f28fb68f454c9451b7434afe17f9b520c97305
Change-Id: Ie402e20884a1bd45f332cdff1f372c9dd821e765
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index c37ea7a..58b4d06 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,7 +16,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)/oriole_car/aosp_oriole_car.mk \
$(LOCAL_DIR)/panther_car/aosp_panther_car.mk \
@@ -28,7 +27,6 @@
COMMON_LUNCH_CHOICES := \
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 \
diff --git a/bramble_car/BoardConfig.mk b/bramble_car/BoardConfig.mk
deleted file mode 100644
index a07e037..0000000
--- a/bramble_car/BoardConfig.mk
+++ /dev/null
@@ -1,32 +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/sunfish/sunfish/BoardConfig.mk,
-# except for:
-#
-# * TARGET_SCREEN_DENSITY is scaled down by 1.75x
-
-
-TARGET_BOOTLOADER_BOARD_NAME := bramble
-TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
-USES_DEVICE_GOOGLE_BRAMBLE := true
-
-include device/google/redbull/BoardConfig-common.mk
-
-# Testing related defines
-#BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/b5-setup.sh
-
--include vendor/google_devices/bramble/proprietary/BoardConfigVendor.mk
diff --git a/bramble_car/aosp_bramble_car.mk b/bramble_car/aosp_bramble_car.mk
deleted file mode 100644
index f909d56..0000000
--- a/bramble_car/aosp_bramble_car.mk
+++ /dev/null
@@ -1,27 +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/bramble_car/device-bramble-car.mk)
-$(call inherit-product-if-exists, vendor/google_devices/bramble/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/bramble/prebuilts/device-vendor-bramble.mk)
-$(call inherit-product, device/google_car/common/post_google_car.mk)
-
-PRODUCT_MANUFACTURER := Google
-PRODUCT_BRAND := Android
-PRODUCT_NAME := aosp_bramble_car
-PRODUCT_DEVICE := bramble
-PRODUCT_MODEL := AOSP on bramble
diff --git a/bramble_car/device-bramble-car.mk b/bramble_car/device-bramble-car.mk
deleted file mode 100644
index f1e5096..0000000
--- a/bramble_car/device-bramble-car.mk
+++ /dev/null
@@ -1,24 +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/bramble_car
-
-$(call inherit-product, packages/services/Car/car_product/build/car.mk)
-
-$(call inherit-product, device/google/bramble/device-bramble.mk)
-
-PRODUCT_PRODUCT_PROPERTIES+= \
- ro.adb.secure=0
diff --git a/common/pre_google_car.mk b/common/pre_google_car.mk
index 5c5972f..f33d93b 100644
--- a/common/pre_google_car.mk
+++ b/common/pre_google_car.mk
@@ -31,7 +31,7 @@
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := false
# Set Car Service RRO
-PRODUCT_PACKAGES += CarServiceOverlayPhoneCar
+PRODUCT_PACKAGES += CarServiceOverlayPhoneCar \
GOOGLE_CAR_SERVICE_OVERLAY += CarServiceOverlayPhoneCarGoogle
# All components inherited here go to system image
@@ -64,6 +64,9 @@
android.hardware.automotive.vehicle@2.0-default-service
endif
+# Set Car Wifi RRO to properly configure the system for AAP
+PRODUCT_PACKAGES += CarWifiOverlay
+
# Additional selinux policy
BOARD_SEPOLICY_DIRS += device/google_car/common/sepolicy
diff --git a/raven_car/device-raven-car.mk b/raven_car/device-raven-car.mk
index 08fd96f..7c58426 100644
--- a/raven_car/device-raven-car.mk
+++ b/raven_car/device-raven-car.mk
@@ -18,7 +18,7 @@
$(call inherit-product, packages/services/Car/car_product/build/car.mk)
-$(call inherit-product, device/google/raviole/device-raven.mk)
+$(call inherit-product, device/google/raviole/raven_generic.mk)
include device/google/gs101/uwb/uwb.mk
diff --git a/tangorpro_car/BoardConfig.mk b/tangorpro_car/BoardConfig.mk
index 691fdc4..ff875e5 100644
--- a/tangorpro_car/BoardConfig.mk
+++ b/tangorpro_car/BoardConfig.mk
@@ -14,6 +14,9 @@
# limitations under the License.
#
-# * TARGET_SCREEN_DENSITY is scaled down by 1.6x
-
-TARGET_SCREEN_DENSITY := 200
+# Adjust the TARGET_SCREEN_DENSITY based on the target name
+ifeq (,$(filter tangorpro_ui_portrait_car, $(TARGET_PRODUCT)))
+ TARGET_SCREEN_DENSITY := 280
+else
+ TARGET_SCREEN_DENSITY := 150
+endif
