From 4c063b2d7ddc3a28cc8043e08e0efbdee9a4177e Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Mon, 14 Aug 2023 15:15:29 +0800 Subject: [PATCH] refactor gps build system Bug: 290725902 Bug: 295461217 Test: build pass and confirm GPS daemon init without problem Change-Id: I0ca115b5373c61f22c98398907aaef848d8957b4 --- device-comet.mk | 4 ++++ factory_comet.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-comet.mk b/device-comet.mk index 45c3e0b..7a9ebd6 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -165,6 +165,10 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/comet/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/comet/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer diff --git a/factory_comet.mk b/factory_comet.mk index e89abfa..cb78662 100644 --- a/factory_comet.mk +++ b/factory_comet.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 binary of camera PRODUCT_PACKAGES += fatp_ct3_wide_hat_tool fatp_ct3_tele_hat_tool fatp_ct3_ultrawide_hat_tool