diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-09-05 18:58:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-09-05 18:58:48 +0000 |
| commit | 4cb0db004cb0e9d905db7ace349059570885defd (patch) | |
| tree | aeb5fbff58b0d49b3e1a84b1bec5ebd358cbf58d | |
| parent | 50d27425fbd24acf2b029020dd2ed610251aabfc (diff) | |
| parent | 46837fe90b5d024d3661f760504fb68036741639 (diff) | |
| download | google_car-4cb0db004cb0e9d905db7ace349059570885defd.tar.gz | |
Merge "Add support for new devices" into main
| -rw-r--r-- | common/post_google_car.mk | 11 | ||||
| -rw-r--r-- | common/pre_google_car.mk | 13 |
2 files changed, 18 insertions, 6 deletions
diff --git a/common/post_google_car.mk b/common/post_google_car.mk index ee1b2e4..beea48c 100644 --- a/common/post_google_car.mk +++ b/common/post_google_car.mk @@ -20,8 +20,13 @@ # Auto modules PRODUCT_PACKAGES += \ - android.hardware.automotive.audiocontrol-service.example \ - android.hardware.automotive.can@1.0-service + android.hardware.automotive.audiocontrol-service.example + +ifneq ($(PIXEL_2023_GEN),) + PRODUCT_PACKAGES += android.hardware.automotive.can +else + PRODUCT_PACKAGES += android.hardware.automotive.can@1.0-service +endif PRODUCT_PACKAGES_DEBUG += \ canhalctrl \ @@ -56,7 +61,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.eab.supported=0 # Explicitly disable support for some Bluetooth profiles included in base phone builds -PRODUCT_PRODUCT_PROPERTIES += \ +PRODUCT_PROPERTY_OVERRIDES += \ bluetooth.profile.asha.central.enabled=false \ bluetooth.profile.a2dp.source.enabled=false \ bluetooth.profile.avrcp.target.enabled=false \ diff --git a/common/pre_google_car.mk b/common/pre_google_car.mk index deb94d3..ca0f30f 100644 --- a/common/pre_google_car.mk +++ b/common/pre_google_car.mk @@ -53,9 +53,16 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # Auto modules -PRODUCT_PACKAGES += \ - android.hardware.broadcastradio@2.0-service \ - android.hardware.automotive.vehicle@2.0-default-service + +ifneq ($(PIXEL_2023_GEN),) + PRODUCT_PACKAGES += \ + android.hardware.broadcastradio \ + android.hardware.automotive.vehicle@V1-default-service +else + PRODUCT_PACKAGES += \ + android.hardware.broadcastradio@2.0-service \ + android.hardware.automotive.vehicle@2.0-default-service +endif # Additional selinux policy BOARD_SEPOLICY_DIRS += device/google_car/common/sepolicy |