From dda56d0ca002e9285e0f3285576313bf5aa8cdff Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Mon, 4 Sep 2023 09:05:28 +0000 Subject: [PATCH] gps: build stable factory sdk Bug: 291186485 Test: verified SDK version by hardware team at b/299463240 Change-Id: I39b99713268053676048549e441e9a5893635e40 --- factory_caiman.mk | 8 ++++++-- factory_komodo.mk | 8 ++++++-- factory_ripcurrent24.mk | 8 ++++++-- factory_ripcurrentpro.mk | 8 ++++++-- factory_tokay.mk | 8 ++++++-- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/factory_caiman.mk b/factory_caiman.mk index 8b79167f..3dceafc0 100644 --- a/factory_caiman.mk +++ b/factory_caiman.mk @@ -31,8 +31,12 @@ 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)) +SOONG_CONFIG_NAMESPACES += gpssdk +SOONG_CONFIG_gpssdk += sdkv1 +override SOONG_CONFIG_gpssdk_sdkv1 := true +SOONG_CONFIG_NAMESPACES += gpssdk +SOONG_CONFIG_gpssdk += gpsmcuversion +override SOONG_CONFIG_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 d3fb48f5..8f5ac089 100644 --- a/factory_komodo.mk +++ b/factory_komodo.mk @@ -31,8 +31,12 @@ 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)) +SOONG_CONFIG_NAMESPACES += gpssdk +SOONG_CONFIG_gpssdk += sdkv1 +override SOONG_CONFIG_gpssdk_sdkv1 := true +SOONG_CONFIG_NAMESPACES += gpssdk +SOONG_CONFIG_gpssdk += gpsmcuversion +override SOONG_CONFIG_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 06ec3f5f..5db0feb8 100644 --- a/factory_ripcurrent24.mk +++ b/factory_ripcurrent24.mk @@ -31,8 +31,12 @@ 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)) +SOONG_CONFIG_NAMESPACES += gpssdk +SOONG_CONFIG_gpssdk += sdkv1 +override SOONG_CONFIG_gpssdk_sdkv1 := true +SOONG_CONFIG_NAMESPACES += gpssdk +SOONG_CONFIG_gpssdk += gpsmcuversion +override SOONG_CONFIG_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 81a4e083..9059a358 100644 --- a/factory_ripcurrentpro.mk +++ b/factory_ripcurrentpro.mk @@ -31,8 +31,12 @@ 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)) +SOONG_CONFIG_NAMESPACES += gpssdk +SOONG_CONFIG_gpssdk += sdkv1 +override SOONG_CONFIG_gpssdk_sdkv1 := true +SOONG_CONFIG_NAMESPACES += gpssdk +SOONG_CONFIG_gpssdk += gpsmcuversion +override SOONG_CONFIG_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 00137dfa..68c4c834 100644 --- a/factory_tokay.mk +++ b/factory_tokay.mk @@ -31,8 +31,12 @@ 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)) +SOONG_CONFIG_NAMESPACES += gpssdk +SOONG_CONFIG_gpssdk += sdkv1 +override SOONG_CONFIG_gpssdk_sdkv1 := true +SOONG_CONFIG_NAMESPACES += gpssdk +SOONG_CONFIG_gpssdk += gpsmcuversion +override SOONG_CONFIG_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