diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-20 20:10:55 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-20 20:10:55 +0000 |
commit | 219730db4a66035a8a100092959b48ef07371f07 (patch) | |
tree | 8545bb919c81003c960878efc8513c7508a3f9ad | |
parent | 6ef0f42bac0a5d613c32c408a4c12050df46cbbd (diff) | |
parent | 821615b5c67e290c354d0d97dac73aa689122102 (diff) | |
download | google_car-aml_ips_331014020.tar.gz |
Snap for 8746144 from 821615b5c67e290c354d0d97dac73aa689122102 to mainline-ipsec-releaseaml_ips_331910010aml_ips_331312000aml_ips_331310000aml_ips_331111030aml_ips_331014020android13-mainline-ipsec-release
Change-Id: I15a97b319679d2d65bfdbef5b85d78fb0c55c5bf
-rw-r--r-- | AndroidProducts.mk | 4 | ||||
-rw-r--r-- | bonito_car/BoardConfig.mk | 27 | ||||
-rw-r--r-- | bonito_car/aosp_bonito_car.mk | 26 | ||||
-rw-r--r-- | bonito_car/device-bonito-car.mk | 24 | ||||
-rw-r--r-- | sargo_car/BoardConfig.mk | 27 | ||||
-rw-r--r-- | sargo_car/aosp_sargo_car.mk | 26 | ||||
-rw-r--r-- | sargo_car/device-sargo-car.mk | 24 |
7 files changed, 0 insertions, 158 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 458afd6..972342e 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,24 +15,20 @@ # PRODUCT_MAKEFILES := \ - $(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)/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 COMMON_LUNCH_CHOICES := \ - aosp_bonito_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 \ - aosp_sargo_car-userdebug \ aosp_sunfish_car-userdebug diff --git a/bonito_car/BoardConfig.mk b/bonito_car/BoardConfig.mk deleted file mode 100644 index cfc639a..0000000 --- a/bonito_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/bonito/bonito/BoardConfig.mk, -# except for: -# -# * TARGET_SCREEN_DENSITY is scaled down by 1.75x - -TARGET_BOOTLOADER_BOARD_NAME := bonito -TARGET_SCREEN_DENSITY := 250 -TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165 - -include device/google/bonito/BoardConfig-common.mk --include vendor/google_devices/bonito/proprietary/BoardConfigVendor.mk diff --git a/bonito_car/aosp_bonito_car.mk b/bonito_car/aosp_bonito_car.mk deleted file mode 100644 index 61d5325..0000000 --- a/bonito_car/aosp_bonito_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/bonito_car/device-bonito-car.mk) -$(call inherit-product-if-exists, vendor/google_devices/bonito/proprietary/device-vendor.mk) -$(call inherit-product, device/google_car/common/post_google_car.mk) - -PRODUCT_MANUFACTURER := Google -PRODUCT_BRAND := Android -PRODUCT_NAME := aosp_bonito_car -PRODUCT_DEVICE := bonito -PRODUCT_MODEL := AOSP on bonito diff --git a/bonito_car/device-bonito-car.mk b/bonito_car/device-bonito-car.mk deleted file mode 100644 index 137206b..0000000 --- a/bonito_car/device-bonito-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. -# - -PHONE_CAR_BOARD_PRODUCT := bonito_car - -$(call inherit-product, packages/services/Car/car_product/build/car.mk) - -$(call inherit-product, device/google/bonito/device-bonito.mk) - -PRODUCT_PRODUCT_PROPERTIES+= \ - ro.adb.secure=0
\ No newline at end of file diff --git a/sargo_car/BoardConfig.mk b/sargo_car/BoardConfig.mk deleted file mode 100644 index e37edfd..0000000 --- a/sargo_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/bonito/sargo/BoardConfig.mk, -# except for: -# -# * TARGET_SCREEN_DENSITY is scaled down by 1.75x - -TARGET_BOOTLOADER_BOARD_NAME := sargo -TARGET_SCREEN_DENSITY := 250 -TARGET_RECOVERY_UI_MARGIN_HEIGHT := 20 - -include device/google/bonito/BoardConfig-common.mk --include vendor/google_devices/bonito/proprietary/BoardConfigVendor.mk diff --git a/sargo_car/aosp_sargo_car.mk b/sargo_car/aosp_sargo_car.mk deleted file mode 100644 index cb1e905..0000000 --- a/sargo_car/aosp_sargo_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/sargo_car/device-sargo-car.mk) -$(call inherit-product-if-exists, vendor/google_devices/bonito/proprietary/device-vendor.mk) -$(call inherit-product, device/google_car/common/post_google_car.mk) - -PRODUCT_MANUFACTURER := Google -PRODUCT_BRAND := Android -PRODUCT_NAME := aosp_sargo_car -PRODUCT_DEVICE := sargo -PRODUCT_MODEL := AOSP on sargo diff --git a/sargo_car/device-sargo-car.mk b/sargo_car/device-sargo-car.mk deleted file mode 100644 index 0965e23..0000000 --- a/sargo_car/device-sargo-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. -# - -PHONE_CAR_BOARD_PRODUCT := sargo_car - -$(call inherit-product, packages/services/Car/car_product/build/car.mk) - -$(call inherit-product, device/google/bonito/device-sargo.mk) - -PRODUCT_PRODUCT_PROPERTIES+= \ - ro.adb.secure=0
\ No newline at end of file |