diff --git a/device-caiman.mk b/device-caiman.mk index d5b8c26c..2e2fc3b4 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -196,6 +196,10 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location +# SDK build system +$(call soong_config_set, include_libsitril-gps-wifi, board_without_radio, $(BOARD_WITHOUT_RADIO)) +include device/google/gs-common/gps/brcm/device.mk + PRODUCT_COPY_FILES += \ device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer diff --git a/device-komodo.mk b/device-komodo.mk index fe138fcf..d2a75061 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -196,6 +196,10 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location +# SDK build system +$(call soong_config_set, include_libsitril-gps-wifi, board_without_radio, $(BOARD_WITHOUT_RADIO)) +include device/google/gs-common/gps/brcm/device.mk + PRODUCT_COPY_FILES += \ device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk index a7d1e342..07e510ea 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -199,6 +199,10 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location +# SDK build system +$(call soong_config_set, include_libsitril-gps-wifi, board_without_radio, $(BOARD_WITHOUT_RADIO)) +include device/google/gs-common/gps/brcm/device.mk + PRODUCT_COPY_FILES += \ device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index 08f654be..3ec8f085 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -197,6 +197,10 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location +# SDK build system +$(call soong_config_set, include_libsitril-gps-wifi, board_without_radio, $(BOARD_WITHOUT_RADIO)) +include device/google/gs-common/gps/brcm/device.mk + PRODUCT_COPY_FILES += \ device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer diff --git a/device-tokay.mk b/device-tokay.mk index b1e7d879..f6a0e9eb 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -196,6 +196,10 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location +# SDK build system +$(call soong_config_set, include_libsitril-gps-wifi, board_without_radio, $(BOARD_WITHOUT_RADIO)) +include device/google/gs-common/gps/brcm/device.mk + PRODUCT_COPY_FILES += \ device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer diff --git a/factory_caiman.mk b/factory_caiman.mk index 60317431..8b79167f 100644 --- a/factory_caiman.mk +++ b/factory_caiman.mk @@ -30,5 +30,9 @@ PRODUCT_MANUFACTURER := Google PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" +# Override to factory SDK +$(call soong_config_set, gpssdk, sdkv1, True) +$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT)) + # Factory binaries of camera PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool diff --git a/factory_komodo.mk b/factory_komodo.mk index 10227f95..d3fb48f5 100644 --- a/factory_komodo.mk +++ b/factory_komodo.mk @@ -30,5 +30,9 @@ PRODUCT_MANUFACTURER := Google PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" +# Override to factory SDK +$(call soong_config_set, gpssdk, sdkv1, True) +$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT)) + # Factory binaries of camera PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool diff --git a/factory_ripcurrent24.mk b/factory_ripcurrent24.mk index 48327ac4..06ec3f5f 100644 --- a/factory_ripcurrent24.mk +++ b/factory_ripcurrent24.mk @@ -30,5 +30,9 @@ PRODUCT_MANUFACTURER := Google PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" +# Override to factory SDK +$(call soong_config_set, gpssdk, sdkv1, True) +$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT)) + # Factory binaries of camera PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool fatp_tk4_front_hat_tool diff --git a/factory_ripcurrentpro.mk b/factory_ripcurrentpro.mk index 5ea53879..81a4e083 100644 --- a/factory_ripcurrentpro.mk +++ b/factory_ripcurrentpro.mk @@ -30,5 +30,9 @@ PRODUCT_MANUFACTURER := Google PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" +# Override to factory SDK +$(call soong_config_set, gpssdk, sdkv1, True) +$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT)) + # Factory binaries of camera PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool fatp_tk4_front_hat_tool diff --git a/factory_tokay.mk b/factory_tokay.mk index 3a9e9b60..00137dfa 100644 --- a/factory_tokay.mk +++ b/factory_tokay.mk @@ -30,5 +30,9 @@ PRODUCT_MANUFACTURER := Google PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" +# Override to factory SDK +$(call soong_config_set, gpssdk, sdkv1, True) +$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT)) + # Factory binaries of camera PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_tk4_front_hat_tool