Merge "uwb: install UWB test apk on RP non-user build" into udc-d1-dev am: 2f50a84487

Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/22638905

Change-Id: Id20658463d46995a45bc4a339c6d46e0d2f38db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-04-14 19:38:18 +00:00 committed by Automerger Merge Worker
commit 76db6d11f5

View file

@ -17,6 +17,10 @@
TARGET_KERNEL_DIR ?= device/google/shusky-kernel TARGET_KERNEL_DIR ?= device/google/shusky-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/shusky-kernel/kernel-headers TARGET_BOARD_KERNEL_HEADERS := device/google/shusky-kernel/kernel-headers
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
USE_UWBFIELDTESTQM := true
endif
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-ripcurrent.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-ripcurrent.mk)
$(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk)