Snap for 7891132 from e6970684304df910b8a506317ad2aea91ae1d58b to sc-d2-releaseandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release

Change-Id: Iefdb5536ec2088f26c2cffa96f89537f8aba25c9

7 files changed, 166 insertions, 1 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 909090d..fd2a083 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -21,6 +21,8 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/coral_car/aosp_coral_car.mk \
     $(LOCAL_DIR)/crosshatch_car/aosp_crosshatch_car.mk \
     $(LOCAL_DIR)/flame_car/aosp_flame_car.mk \
+    $(LOCAL_DIR)/oriole_car/aosp_oriole_car.mk \
+    $(LOCAL_DIR)/raven_car/aosp_raven_car.mk \
     $(LOCAL_DIR)/redfin_car/aosp_redfin_car.mk \
     $(LOCAL_DIR)/sargo_car/aosp_sargo_car.mk \
     $(LOCAL_DIR)/sunfish_car/aosp_sunfish_car.mk
@@ -33,7 +35,8 @@ COMMON_LUNCH_CHOICES := \
     aosp_coral_car-userdebug \
     aosp_crosshatch_car-userdebug \
     aosp_flame_car-userdebug \
+    aosp_oriole_car-userdebug \
+    aosp_raven_car-userdebug \
     aosp_redfin_car-userdebug \
     aosp_sargo_car-userdebug \
     aosp_sunfish_car-userdebug
-
diff --git a/oriole_car/BoardConfig.mk b/oriole_car/BoardConfig.mk
new file mode 100644
index 0000000..f612c93
--- /dev/null
+++ b/oriole_car/BoardConfig.mk
@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2021 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/raviole/raven/BoardConfig.mk,
+# except for:
+#
+# * TARGET_SCREEN_DENSITY is scaled down by 1.75x
+
+TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
+TARGET_BOOTLOADER_BOARD_NAME := raviole
+TARGET_SCREEN_DENSITY := 240
+USES_DEVICE_GOOGLE_RAVIOLE := true
+
+include device/google/gs101/BoardConfig-common.mk
+-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
diff --git a/oriole_car/aosp_oriole_car.mk b/oriole_car/aosp_oriole_car.mk
new file mode 100644
index 0000000..606c025
--- /dev/null
+++ b/oriole_car/aosp_oriole_car.mk
@@ -0,0 +1,26 @@
+#
+# Copyright 2021 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/oriole_car/device-oriole-car.mk)
+$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/raven/device-vendor-oriole.mk)
+$(call inherit-product, device/google_car/common/post_google_car.mk)
+
+PRODUCT_MANUFACTURER := Google
+PRODUCT_BRAND := Android
+PRODUCT_NAME := aosp_oriole_car
+PRODUCT_DEVICE := oriole
+PRODUCT_MODEL := AOSP on oriole
diff --git a/oriole_car/device-oriole-car.mk b/oriole_car/device-oriole-car.mk
new file mode 100644
index 0000000..e37b6b8
--- /dev/null
+++ b/oriole_car/device-oriole-car.mk
@@ -0,0 +1,26 @@
+#
+# Copyright 2021 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.
+#
+
+PHONE_CAR_BOARD_CONFIG := device/google_car/oriole_car/BoardConfig.mk
+
+$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+
+$(call inherit-product, device/google/raviole/device-oriole.mk)
+
+include device/google/gs101/uwb/uwb.mk
+
+PRODUCT_PRODUCT_PROPERTIES+= \
+    ro.adb.secure=0
diff --git a/raven_car/BoardConfig.mk b/raven_car/BoardConfig.mk
new file mode 100644
index 0000000..1e8c864
--- /dev/null
+++ b/raven_car/BoardConfig.mk
@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2021 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/raviole/raven/BoardConfig.mk,
+# except for:
+#
+# * TARGET_SCREEN_DENSITY is scaled down by 1.75x
+
+TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
+TARGET_BOOTLOADER_BOARD_NAME := raven
+TARGET_SCREEN_DENSITY := 320
+USES_DEVICE_GOOGLE_RAVIOLE := true
+
+include device/google/gs101/BoardConfig-common.mk
+-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk
diff --git a/raven_car/aosp_raven_car.mk b/raven_car/aosp_raven_car.mk
new file mode 100644
index 0000000..cebd123
--- /dev/null
+++ b/raven_car/aosp_raven_car.mk
@@ -0,0 +1,26 @@
+#
+# Copyright 2021 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/raven_car/device-raven-car.mk)
+$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/raven/device-vendor-raven.mk)
+$(call inherit-product, device/google_car/common/post_google_car.mk)
+
+PRODUCT_MANUFACTURER := Google
+PRODUCT_BRAND := Android
+PRODUCT_NAME := aosp_raven_car
+PRODUCT_DEVICE := raven
+PRODUCT_MODEL := AOSP on raven
diff --git a/raven_car/device-raven-car.mk b/raven_car/device-raven-car.mk
new file mode 100644
index 0000000..75c751f
--- /dev/null
+++ b/raven_car/device-raven-car.mk
@@ -0,0 +1,26 @@
+#
+# Copyright 2021 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.
+#
+
+PHONE_CAR_BOARD_CONFIG := device/google_car/raven_car/BoardConfig.mk
+
+$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+
+$(call inherit-product, device/google/raviole/device-raven.mk)
+
+include device/google/gs101/uwb/uwb.mk
+
+PRODUCT_PRODUCT_PROPERTIES+= \
+    ro.adb.secure=0