diff options
author | Xin Li <delphij@google.com> | 2022-10-06 12:01:37 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2022-10-06 12:01:37 -0700 |
commit | 46b575c92a52c4bf704f4204cbf1df7290f663d2 (patch) | |
tree | e3dc0a0d4729470b04224bfe21638568b346bb7a | |
parent | 70e0e9c291c89db425e3f09f76583969af6185a4 (diff) | |
parent | 170d7f720764b79cc42b3ed5202f5fed1b6c2387 (diff) | |
download | google_car-46b575c92a52c4bf704f4204cbf1df7290f663d2.tar.gz |
Merge tm-qpr-dev-plus-aosp-without-vendor@9129937
Bug: 248070379
Merged-In: I77b937775fa774c700b9a080a92bbeb9d80f5d32
Change-Id: I197005aa837d502942094b071cae2b97c7a71d41
-rw-r--r-- | AndroidProducts.mk | 2 | ||||
-rw-r--r-- | bluejay_car/BoardConfig.mk | 22 | ||||
-rw-r--r-- | bluejay_car/aosp_bluejay_car.mk | 26 | ||||
-rw-r--r-- | bluejay_car/device-bluejay-car.mk | 26 | ||||
-rw-r--r-- | common/pre_google_car.mk | 6 | ||||
-rw-r--r-- | oriole_car/BoardConfig.mk | 7 | ||||
-rw-r--r-- | raven_car/BoardConfig.mk | 7 |
7 files changed, 80 insertions, 16 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 972342e..c0701df 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,6 +15,7 @@ # 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 \ @@ -25,6 +26,7 @@ PRODUCT_MAKEFILES := \ COMMON_LUNCH_CHOICES := \ + aosp_bluejay_car-userdebug \ aosp_bramble_car-userdebug \ aosp_coral_car-userdebug \ aosp_flame_car-userdebug \ diff --git a/bluejay_car/BoardConfig.mk b/bluejay_car/BoardConfig.mk new file mode 100644 index 0000000..123fca7 --- /dev/null +++ b/bluejay_car/BoardConfig.mk @@ -0,0 +1,22 @@ +# +# Copyright (C) 2022 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_SCREEN_DENSITY := 240 diff --git a/bluejay_car/aosp_bluejay_car.mk b/bluejay_car/aosp_bluejay_car.mk new file mode 100644 index 0000000..e41a06e --- /dev/null +++ b/bluejay_car/aosp_bluejay_car.mk @@ -0,0 +1,26 @@ +# +# Copyright 2022 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/bluejay_car/device-bluejay-car.mk) +$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/raven/device-vendor-bluejay.mk) +$(call inherit-product, device/google_car/common/post_google_car.mk) + +PRODUCT_MANUFACTURER := Google +PRODUCT_BRAND := Android +PRODUCT_NAME := aosp_bluejay_car +PRODUCT_DEVICE := bluejay +PRODUCT_MODEL := AOSP on bluejay diff --git a/bluejay_car/device-bluejay-car.mk b/bluejay_car/device-bluejay-car.mk new file mode 100644 index 0000000..aa426b3 --- /dev/null +++ b/bluejay_car/device-bluejay-car.mk @@ -0,0 +1,26 @@ +# +# Copyright 2022 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 := bluejay_car + +$(call inherit-product, packages/services/Car/car_product/build/car.mk) + +$(call inherit-product,device/google/bluejay/device-bluejay.mk) + +include device/google/gs101/uwb/uwb.mk + +PRODUCT_PRODUCT_PROPERTIES+= \ + ro.adb.secure=0 diff --git a/common/pre_google_car.mk b/common/pre_google_car.mk index 8f6c9e6..7cb6379 100644 --- a/common/pre_google_car.mk +++ b/common/pre_google_car.mk @@ -28,8 +28,10 @@ PRODUCT_ENFORCE_RRO_TARGETS := PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := false # All components inherited here go to system image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +# Skip this for 64 bit only devices +ifneq ($(DEVICE_IS_64BIT_ONLY),true) + $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +endif $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) # diff --git a/oriole_car/BoardConfig.mk b/oriole_car/BoardConfig.mk index 5b5230c..b60da91 100644 --- a/oriole_car/BoardConfig.mk +++ b/oriole_car/BoardConfig.mk @@ -19,11 +19,4 @@ # # * TARGET_SCREEN_DENSITY is scaled down by 1.75x -TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt -TARGET_BOOTLOADER_BOARD_NAME := oriole 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/raven_car/BoardConfig.mk b/raven_car/BoardConfig.mk index 1e8c864..d327f95 100644 --- a/raven_car/BoardConfig.mk +++ b/raven_car/BoardConfig.mk @@ -19,11 +19,4 @@ # # * 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 |