diff options
| author | Cole Faust <colefaust@google.com> | 2024-03-07 10:00:20 -0800 |
|---|---|---|
| committer | Cole Faust <colefaust@google.com> | 2024-03-07 10:17:32 -0800 |
| commit | c44cfe952ded152696789590516fa864fe2f3bb8 (patch) | |
| tree | 85989bd5f28810f05ec7b66a4fec162261787eb4 | |
| parent | dca283b4183e111e6cf4575adec42ab51bab9923 (diff) | |
| download | gs-common-c44cfe952ded152696789590516fa864fe2f3bb8.tar.gz | |
Use soong_config_get/set instead of raw variable accesses
The raw variable accesses are breaking the rbc product config CI.
Test: ./build/bazel/ci/rbc_dashboard.py --quick factory_husky-trunk_staging-userdebug factory_ripcurrent factory_shiba
Change-Id: Ied0b29d9eeae65fb94900258627247b0a4145bc5
| -rw-r--r-- | gps/brcm/device.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gps/brcm/device.mk b/gps/brcm/device.mk index 3065542..45b4eb0 100644 --- a/gps/brcm/device.mk +++ b/gps/brcm/device.mk @@ -1,14 +1,12 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/brcm/sepolicy PRODUCT_SOONG_NAMESPACES += vendor/broadcom/gps/bcm47765 - -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += sdkv1 -SOONG_CONFIG_gpssdk_sdkv1 ?= false - -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsmcuversion -SOONG_CONFIG_gpssdk_gpsmcuversion ?= gpsv2_$(TARGET_BUILD_VARIANT) +ifeq (,$(call soong_config_get,gpssdk,sdkv1)) + $(call soong_config_set,gpssdk,sdkv1,false) +endif +ifeq (,$(call soong_config_get,gpssdk,gpsmcuversion)) + $(call soong_config_set,gpssdk,gpsmcuversion,gpsv2_$(TARGET_BUILD_VARIANT)) +endif PRODUCT_PACKAGES += \ bcm47765_gps_package \ |