Revert "Remove coral_car and flame_car"

This reverts commit 2c9a87783ef9ebb5071f8960fded041d3f0cc513.

Reason for revert: breaks build_test4

Change-Id: Ied5fb4b1deffb55d8faf2b1f8b01b91228542ad0

7 files changed, 154 insertions, 0 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 57323b1..c0701df 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -17,6 +17,8 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/bluejay_car/aosp_bluejay_car.mk \
     $(LOCAL_DIR)/bramble_car/aosp_bramble_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)/raven_car/aosp_raven_car.mk \
     $(LOCAL_DIR)/redfin_car/aosp_redfin_car.mk \
@@ -26,6 +28,8 @@ PRODUCT_MAKEFILES := \
 COMMON_LUNCH_CHOICES := \
     aosp_bluejay_car-userdebug \
     aosp_bramble_car-userdebug \
+    aosp_coral_car-userdebug \
+    aosp_flame_car-userdebug \
     aosp_oriole_car-userdebug \
     aosp_raven_car-userdebug \
     aosp_redfin_car-userdebug \
diff --git a/coral_car/BoardConfig.mk b/coral_car/BoardConfig.mk
new file mode 100644
index 0000000..5978b7d
--- /dev/null
+++ b/coral_car/BoardConfig.mk
@@ -0,0 +1,26 @@
+#
+# 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
new file mode 100644
index 0000000..130bff2
--- /dev/null
+++ b/coral_car/aosp_coral_car.mk
@@ -0,0 +1,27 @@
+#
+# 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
new file mode 100644
index 0000000..e43eb0a
--- /dev/null
+++ b/coral_car/device-coral-car.mk
@@ -0,0 +1,21 @@
+#
+# 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
new file mode 100644
index 0000000..22e8ca4
--- /dev/null
+++ b/flame_car/BoardConfig.mk
@@ -0,0 +1,27 @@
+#
+# 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
new file mode 100644
index 0000000..6c2cd0f
--- /dev/null
+++ b/flame_car/aosp_flame_car.mk
@@ -0,0 +1,28 @@
+#
+# 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
new file mode 100644
index 0000000..29967d2
--- /dev/null
+++ b/flame_car/device-flame-car.mk
@@ -0,0 +1,21 @@
+#
+# 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)