refactor gps build system

Bug: 290725902
Bug: 291186485
Bug: 295461217
Test: build pass and confirm GPS daemon init without problem
Change-Id: If1b70a234e9ed100c3e0130d483ea02d813bbcfb
This commit is contained in:
Wayne Lin 2023-08-21 16:30:16 +08:00
parent b5194d9b24
commit feb92fa641
10 changed files with 40 additions and 0 deletions

View file

@ -196,6 +196,10 @@ PRODUCT_PACKAGES += \
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
# Location # 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 += \ PRODUCT_COPY_FILES += \
device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer

View file

@ -196,6 +196,10 @@ PRODUCT_PACKAGES += \
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
# Location # 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 += \ PRODUCT_COPY_FILES += \
device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer

View file

@ -199,6 +199,10 @@ PRODUCT_PACKAGES += \
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
# Location # 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 += \ PRODUCT_COPY_FILES += \
device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer

View file

@ -197,6 +197,10 @@ PRODUCT_PACKAGES += \
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
# Location # 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 += \ PRODUCT_COPY_FILES += \
device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer

View file

@ -196,6 +196,10 @@ PRODUCT_PACKAGES += \
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
# Location # 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 += \ PRODUCT_COPY_FILES += \
device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer device/google/caimito/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer

View file

@ -30,5 +30,9 @@ PRODUCT_MANUFACTURER := Google
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" 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 # 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 PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool

View file

@ -30,5 +30,9 @@ PRODUCT_MANUFACTURER := Google
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" 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 # 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 PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool

View file

@ -30,5 +30,9 @@ PRODUCT_MANUFACTURER := Google
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" 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 # 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 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

View file

@ -30,5 +30,9 @@ PRODUCT_MANUFACTURER := Google
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" 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 # 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 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

View file

@ -30,5 +30,9 @@ PRODUCT_MANUFACTURER := Google
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" 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 # Factory binaries of camera
PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_tk4_front_hat_tool PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_tk4_front_hat_tool