From d59321a59547dab06c4c8910cbe3096dddc5b9c6 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Tue, 6 Feb 2024 09:54:29 -0800
Subject: [PATCH] Rename include_libsitril-gps-wifi

We're adding a restriction that soong config namespaces/variables
are valid go identifiers. The dash in the name fails that check.

Bug: 323382414
Test: Presubmits
Change-Id: Ic8d92ec69abecaeaf955bb239fca65a013891a34
---
 device-caiman.mk        | 2 +-
 device-komodo.mk        | 2 +-
 device-ripcurrent24.mk  | 2 +-
 device-ripcurrentpro.mk | 2 +-
 device-tokay.mk         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/device-caiman.mk b/device-caiman.mk
index 9247ea61..73786d37 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -241,7 +241,7 @@ $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
 PRODUCT_PACKAGES += gps.cfg
 # eGNSS
 # SDK build system
-$(call soong_config_set, include_libsitril-gps-wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
+$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
 include device/google/gs-common/gps/brcm/device.mk
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/caiman
 SOONG_CONFIG_NAMESPACES += gpssdk
diff --git a/device-komodo.mk b/device-komodo.mk
index d914d7b6..e99174ba 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -260,7 +260,7 @@ $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
 PRODUCT_PACKAGES += gps.cfg
 # eGNSS
 # SDK build system
-$(call soong_config_set, include_libsitril-gps-wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
+$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
 include device/google/gs-common/gps/brcm/device.mk
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/komodo
 SOONG_CONFIG_NAMESPACES += gpssdk
diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk
index 591853b6..f5938ff8 100644
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@@ -206,7 +206,7 @@ $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
 PRODUCT_PACKAGES += gps.cfg
 # eGNSS
 # SDK build system
-$(call soong_config_set, include_libsitril-gps-wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
+$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
 include device/google/gs-common/gps/brcm/device.mk
 
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrent24
diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk
index dfc4e082..b21a06c2 100644
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@@ -208,7 +208,7 @@ $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
 PRODUCT_PACKAGES += gps.cfg
 # eGNSS
 # SDK build system
-$(call soong_config_set, include_libsitril-gps-wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
+$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
 include device/google/gs-common/gps/brcm/device.mk
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrentpro
 SOONG_CONFIG_NAMESPACES += gpssdk
diff --git a/device-tokay.mk b/device-tokay.mk
index cbb5bc41..e836e409 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -231,7 +231,7 @@ $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
 PRODUCT_PACKAGES += gps.cfg
 # eGNSS
 # SDK build system
-$(call soong_config_set, include_libsitril-gps-wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
+$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
 include device/google/gs-common/gps/brcm/device.mk
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/tokay
 SOONG_CONFIG_NAMESPACES += gpssdk