Snap for 12327203 from ed46d4d345 to 24Q4-release

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

View file

@ -33,3 +33,9 @@ include device/google/gs201/BoardConfig-common.mk
-include vendor/google_devices/cheetah/proprietary/BoardConfigVendor.mk -include vendor/google_devices/cheetah/proprietary/BoardConfigVendor.mk
include device/google/pantah-sepolicy/cheetah-sepolicy.mk include device/google/pantah-sepolicy/cheetah-sepolicy.mk
include device/google/pantah/wifi/BoardConfig-wifi.mk include device/google/pantah/wifi/BoardConfig-wifi.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

@ -468,3 +468,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Bluetooth device id # Bluetooth device id
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.device_id.product_id=20490 bluetooth.device_id.product_id=20490
# 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

@ -451,3 +451,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Bluetooth device id # Bluetooth device id
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.device_id.product_id=20489 bluetooth.device_id.product_id=20489
# 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

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