Snap for 12327203 from e0fcb2d3ba to 24Q4-release

Change-Id: Iad2add644e5f34895ee126af372d2f56cd4ef421
This commit is contained in:
Android Build Coastguard Worker 2024-09-05 23:02:19 +00:00
commit 6d55119df7
4 changed files with 26 additions and 0 deletions

View file

@ -347,3 +347,10 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
# Bluetooth device id # Bluetooth device id
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.device_id.product_id=20486 bluetooth.device_id.product_id=20486
# ETM
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif
endif

View file

@ -357,3 +357,10 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
# Bluetooth device id # Bluetooth device id
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.device_id.product_id=20487 bluetooth.device_id.product_id=20487
# ETM
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif
endif

View file

@ -43,3 +43,9 @@ include device/google/gs101-sepolicy/oriole-sepolicy.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk -include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/BoardUserdebugModules.mk
endif
endif

View file

@ -43,3 +43,9 @@ include device/google/gs101-sepolicy/raven-sepolicy.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/BoardUserdebugModules.mk
endif
endif