diff options
author | Xin Li <delphij@google.com> | 2022-01-20 11:04:34 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2022-01-25 16:48:50 +0000 |
commit | 1423829d3d53f3a9107ce31813401370eef81608 (patch) | |
tree | aca0fd0935326391fe87ea6363c141a4b44edb88 | |
parent | 13dbff1977fc223165543c7a89b462f34199e0d3 (diff) | |
download | google_car-android-s-v2-beta-3.tar.gz |
Remove crosshatch dependencies.android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Bug: 209035098
Bug: 216301071
Fixed: 216301071
Merged-In: I4cca632fa794d68469b3f2e7343213c205412832
Change-Id: I4cca632fa794d68469b3f2e7343213c205412832
(cherry picked from commit bb8dcf24a1e220ba76f4c0e17b8d06923a40a5b8)
-rw-r--r-- | AndroidProducts.mk | 4 | ||||
-rw-r--r-- | blueline_car/BoardConfig.mk | 26 | ||||
-rw-r--r-- | blueline_car/aosp_blueline_car.mk | 26 | ||||
-rw-r--r-- | blueline_car/device-blueline-car.mk | 28 | ||||
-rw-r--r-- | blueline_car/evs/app_config.json | 78 | ||||
-rw-r--r-- | blueline_car/evs/hal_config.xml | 141 | ||||
-rw-r--r-- | crosshatch_car/BoardConfig.mk | 26 | ||||
-rw-r--r-- | crosshatch_car/aosp_crosshatch_car.mk | 26 | ||||
-rw-r--r-- | crosshatch_car/device-crosshatch-car.mk | 22 |
9 files changed, 0 insertions, 377 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 909090d..39ec642 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,11 +15,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/blueline_car/aosp_blueline_car.mk \ $(LOCAL_DIR)/bonito_car/aosp_bonito_car.mk \ $(LOCAL_DIR)/bramble_car/aosp_bramble_car.mk \ $(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)/redfin_car/aosp_redfin_car.mk \ $(LOCAL_DIR)/sargo_car/aosp_sargo_car.mk \ @@ -27,11 +25,9 @@ PRODUCT_MAKEFILES := \ COMMON_LUNCH_CHOICES := \ - aosp_blueline_car-userdebug \ aosp_bonito_car-userdebug \ aosp_bramble_car-userdebug \ aosp_coral_car-userdebug \ - aosp_crosshatch_car-userdebug \ aosp_flame_car-userdebug \ aosp_redfin_car-userdebug \ aosp_sargo_car-userdebug \ diff --git a/blueline_car/BoardConfig.mk b/blueline_car/BoardConfig.mk deleted file mode 100644 index da35c33..0000000 --- a/blueline_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/crosshatch/blueline/BoardConfig.mk, -# except for: -# -# * TARGET_SCREEN_DENSITY is scaled down by 1.75x - -TARGET_BOOTLOADER_BOARD_NAME := blueline -TARGET_SCREEN_DENSITY := 250 -TARGET_RECOVERY_UI_MARGIN_HEIGHT := 20 - -include device/google/crosshatch/BoardConfig-common.mk diff --git a/blueline_car/aosp_blueline_car.mk b/blueline_car/aosp_blueline_car.mk deleted file mode 100644 index b4a6452..0000000 --- a/blueline_car/aosp_blueline_car.mk +++ /dev/null @@ -1,26 +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/blueline_car/device-blueline-car.mk) -$(call inherit-product, device/google_car/common/post_google_car.mk) -$(call inherit-product-if-exists, vendor/google_devices/crosshatch/proprietary/device-vendor.mk) - -PRODUCT_MANUFACTURER := Google -PRODUCT_BRAND := Android -PRODUCT_NAME := aosp_blueline_car -PRODUCT_DEVICE := blueline -PRODUCT_MODEL := AOSP on blueline diff --git a/blueline_car/device-blueline-car.mk b/blueline_car/device-blueline-car.mk deleted file mode 100644 index b85b113..0000000 --- a/blueline_car/device-blueline-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. -# - -PHONE_CAR_BOARD_PRODUCT := blueline_car - -ENABLE_EVS_SAMPLE := true -ifeq ($(ENABLE_EVS_SAMPLE), true) -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/evs/app_config.json:system/etc/automotive/evs/config_override.json \ - $(LOCAL_PATH)/evs/hal_config.xml:vendor/etc/automotive/evs/evs_configuration_override.xml -endif - -$(call inherit-product, packages/services/Car/car_product/build/car.mk) - -$(call inherit-product, device/google/crosshatch/device-blueline.mk) diff --git a/blueline_car/evs/app_config.json b/blueline_car/evs/app_config.json deleted file mode 100644 index c1cd74b..0000000 --- a/blueline_car/evs/app_config.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "_comment": "This is for the blueline device", - "car" : { - "width" : 76.7, - "wheelBase" : 117.9, - "frontExtent" : 44.7, - "rearExtent" : 40 - }, - "displays" : [ - { - "displayPort" : 0, - "frontRange" : 100, - "rearRange" : 100 - } - ], - "graphic" : { - "frontPixel" : -20, - "rearPixel" : 260 - }, - "cameras" : [ - { - "cameraId" : "/dev/video10", - "function" : "reverse,park", - "x" : 0.0, - "y" : 20.0, - "z" : 48, - "yaw" : 180, - "pitch" : -10, - "roll" : 0, - "hfov" : 115, - "vfov" : 80, - "hflip" : true, - "vflip" : false - }, - { - "cameraId" : "/dev/video11", - "function" : "front,park", - "x" : 0.0, - "y" : 100.0, - "z" : 48, - "yaw" : 0, - "pitch" : -10, - "roll" : 0, - "hfov" : 115, - "vfov" : 80, - "hflip" : false, - "vflip" : false - }, - { - "cameraId" : "/dev/video12", - "function" : "right,park", - "x" : -25.0, - "y" : 60.0, - "z" : 88, - "yaw" : -90, - "pitch" : -10, - "roll" : 0, - "hfov" : 60, - "vfov" : 62, - "hflip" : false, - "vflip" : false - }, - { - "cameraId" : "/dev/video13", - "function" : "left, park", - "x" : 20.0, - "y" : 60.0, - "z" : 88, - "yaw" : 90, - "pitch" : -10, - "roll" : 0, - "hfov" : 60, - "vfov" : 62, - "hflip" : false, - "vflip" : false - } - ] -} diff --git a/blueline_car/evs/hal_config.xml b/blueline_car/evs/hal_config.xml deleted file mode 100644 index 9ab86f8..0000000 --- a/blueline_car/evs/hal_config.xml +++ /dev/null @@ -1,141 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<!-- 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. ---> - -<!-- Exterior View System Example Configuration - - Android Automotive axes are used to define coordinates. - See https://source.android.com/devices/sensors/sensor-types#auto_axes - - Use evs_configuration.dtd with xmllint tool, to validate XML configuration file ---> - -<configuration> - <!-- system configuration for the blueline --> - <system> - <!-- number of cameras available to EVS --> - <num_cameras value='4'/> - </system> - - <!-- camera device information --> - <camera> - <!-- vivid emulated video devices --> - <device id='/dev/video10' position='rear'> - <caps> - <!-- list of supported controls --> - <supported_controls> - <control name='BRIGHTNESS' min='0' max='255'/> - <control name='CONTRAST' min='0' max='255'/> - <control name='AUTO_WHITE_BALANCE' min='0' max='1'/> - <control name='WHITE_BALANCE_TEMPERATURE' min='2000' max='7500'/> - <control name='SHARPNESS' min='0' max='255'/> - <control name='AUTO_FOCUS' min='0' max='1'/> - <control name='ABSOLUTE_FOCUS' min='0' max='255' step='5'/> - <control name='ABSOLUTE_ZOOM' min='100' max='400'/> - </supported_controls> - - <!-- list of supported stream configurations --> - <!-- vivid webcam input support below three resolutions --> - <stream id='0' width='1280' height='720' format='RGBA_8888' framerate='5'/> - <stream id='1' width='640' height='360' format='RGBA_8888' framerate='15'/> - <stream id='2' width='360' height='180' format='RGBA_8888' framerate='30'/> - </caps> - - <!-- list of parameters --> - <characteristics/> - </device> - <device id='/dev/video11' position='left'> - <caps> - <!-- list of supported controls --> - <supported_controls> - <control name='BRIGHTNESS' min='0' max='255'/> - <control name='CONTRAST' min='0' max='255'/> - <control name='AUTO_WHITE_BALANCE' min='0' max='1'/> - <control name='WHITE_BALANCE_TEMPERATURE' min='2000' max='7500'/> - <control name='SHARPNESS' min='0' max='255'/> - <control name='AUTO_FOCUS' min='0' max='1'/> - <control name='ABSOLUTE_FOCUS' min='0' max='255' step='5'/> - <control name='ABSOLUTE_ZOOM' min='100' max='400'/> - </supported_controls> - - <!-- list of supported stream configurations --> - <!-- vivid webcam input support below three resolutions --> - <stream id='0' width='1280' height='720' format='RGBA_8888' framerate='5'/> - <stream id='1' width='640' height='360' format='RGBA_8888' framerate='15'/> - <stream id='2' width='360' height='180' format='RGBA_8888' framerate='30'/> - </caps> - - <!-- list of parameters --> - <characteristics/> - </device> - <device id='/dev/video12' position='right'> - <caps> - <!-- list of supported controls --> - <supported_controls> - <control name='BRIGHTNESS' min='0' max='255'/> - <control name='CONTRAST' min='0' max='255'/> - <control name='AUTO_WHITE_BALANCE' min='0' max='1'/> - <control name='WHITE_BALANCE_TEMPERATURE' min='2000' max='7500'/> - <control name='SHARPNESS' min='0' max='255'/> - <control name='AUTO_FOCUS' min='0' max='1'/> - <control name='ABSOLUTE_FOCUS' min='0' max='255' step='5'/> - <control name='ABSOLUTE_ZOOM' min='100' max='400'/> - </supported_controls> - - <!-- list of supported stream configurations --> - <!-- vivid webcam input support below three resolutions --> - <stream id='0' width='1280' height='720' format='RGBA_8888' framerate='5'/> - <stream id='1' width='640' height='360' format='RGBA_8888' framerate='15'/> - <stream id='2' width='360' height='180' format='RGBA_8888' framerate='30'/> - </caps> - - <!-- list of parameters --> - <characteristics/> - </device> - <device id='/dev/video13' position='front'> - <caps> - <!-- list of supported controls --> - <supported_controls> - <control name='BRIGHTNESS' min='0' max='255'/> - <control name='CONTRAST' min='0' max='255'/> - <control name='AUTO_WHITE_BALANCE' min='0' max='1'/> - <control name='WHITE_BALANCE_TEMPERATURE' min='2000' max='7500'/> - <control name='SHARPNESS' min='0' max='255'/> - <control name='AUTO_FOCUS' min='0' max='1'/> - <control name='ABSOLUTE_FOCUS' min='0' max='255' step='5'/> - <control name='ABSOLUTE_ZOOM' min='100' max='400'/> - </supported_controls> - - <!-- list of supported stream configurations --> - <!-- vivid webcam input support below three resolutions --> - <stream id='0' width='1280' height='720' format='RGBA_8888' framerate='5'/> - <stream id='1' width='640' height='360' format='RGBA_8888' framerate='15'/> - <stream id='2' width='360' height='180' format='RGBA_8888' framerate='30'/> - </caps> - - <!-- list of parameters --> - <characteristics/> - </device> - </camera> - - <!-- display device starts --> - <display> - <device id='display0' position='driver'> - <caps> - <!-- list of supported inpu stream configurations --> - <stream id='0' width='1280' height='720' format='RGBA_8888' framerate='30'/> - </caps> - </device> - </display> -</configuration> diff --git a/crosshatch_car/BoardConfig.mk b/crosshatch_car/BoardConfig.mk deleted file mode 100644 index 9b5dc52..0000000 --- a/crosshatch_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/crosshatch/crosshatch/BoardConfig.mk, -# except for: -# -# * TARGET_SCREEN_DENSITY is scaled down by 1.75x - -TARGET_BOOTLOADER_BOARD_NAME := crosshatch -TARGET_SCREEN_DENSITY := 320 -TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165 - -include device/google/crosshatch/BoardConfig-common.mk diff --git a/crosshatch_car/aosp_crosshatch_car.mk b/crosshatch_car/aosp_crosshatch_car.mk deleted file mode 100644 index 4a5a690..0000000 --- a/crosshatch_car/aosp_crosshatch_car.mk +++ /dev/null @@ -1,26 +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/crosshatch_car/device-crosshatch-car.mk) -$(call inherit-product-if-exists, vendor/google_devices/crosshatch/proprietary/device-vendor.mk) -$(call inherit-product, device/google_car/common/post_google_car.mk) - -PRODUCT_MANUFACTURER := Google -PRODUCT_BRAND := Android -PRODUCT_NAME := aosp_crosshatch_car -PRODUCT_DEVICE := crosshatch -PRODUCT_MODEL := AOSP on crosshatch diff --git a/crosshatch_car/device-crosshatch-car.mk b/crosshatch_car/device-crosshatch-car.mk deleted file mode 100644 index d72bcd6..0000000 --- a/crosshatch_car/device-crosshatch-car.mk +++ /dev/null @@ -1,22 +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. -# - -PHONE_CAR_BOARD_PRODUCT := crosshatch_car - -$(call inherit-product, packages/services/Car/car_product/build/car.mk) - -$(call inherit-product, device/google/crosshatch/device-crosshatch.mk) - |