Merge "refactor gps build system" into udc-qpr-dev
This commit is contained in:
commit
23dcb1e9d2
6 changed files with 12 additions and 24 deletions
|
@ -246,14 +246,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
|
|||
|
||||
# Location
|
||||
# SDK build system
|
||||
ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||
# Release stable version to factory image
|
||||
ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
|
||||
include device/google/gs-common/gps/brcm/device.mk
|
||||
else
|
||||
include device/google/gs-common/gps/brcm/device_v2.mk
|
||||
endif
|
||||
endif
|
||||
include device/google/gs-common/gps/brcm/device.mk
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
|
||||
|
|
|
@ -204,14 +204,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
|
|||
|
||||
# Location
|
||||
# SDK build system
|
||||
ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||
# Release stable version to factory image
|
||||
ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
|
||||
include device/google/gs-common/gps/brcm/device.mk
|
||||
else
|
||||
include device/google/gs-common/gps/brcm/device_v2.mk
|
||||
endif
|
||||
endif
|
||||
include device/google/gs-common/gps/brcm/device.mk
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
|
||||
|
|
|
@ -236,14 +236,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
|
|||
|
||||
# Location
|
||||
# SDK build system
|
||||
ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||
# Release stable version to factory image
|
||||
ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
|
||||
include device/google/gs-common/gps/brcm/device.mk
|
||||
else
|
||||
include device/google/gs-common/gps/brcm/device_v2.mk
|
||||
endif
|
||||
endif
|
||||
include device/google/gs-common/gps/brcm/device.mk
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
|
||||
|
|
|
@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15
|
|||
$(call inherit-product, device/google/zuma/factory_common.mk)
|
||||
$(call inherit-product, device/google/shusky/device-husky.mk)
|
||||
include device/google/shusky/audio/husky/factory-audio-tables.mk
|
||||
# Override to factory SDK
|
||||
$(call soong_config_set, gpssdk, sdkv1, True)
|
||||
$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
|
||||
|
||||
PRODUCT_NAME := factory_husky
|
||||
PRODUCT_DEVICE := husky
|
||||
|
|
|
@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15
|
|||
$(call inherit-product, device/google/zuma/factory_common.mk)
|
||||
$(call inherit-product, device/google/shusky/device-ripcurrent.mk)
|
||||
include device/google/shusky/audio/ripcurrent/factory-audio-tables.mk
|
||||
# Override to factory SDK
|
||||
$(call soong_config_set, gpssdk, sdkv1, True)
|
||||
$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
|
||||
|
||||
PRODUCT_NAME := factory_ripcurrent
|
||||
PRODUCT_DEVICE := ripcurrent
|
||||
|
|
|
@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15
|
|||
$(call inherit-product, device/google/zuma/factory_common.mk)
|
||||
$(call inherit-product, device/google/shusky/device-shiba.mk)
|
||||
include device/google/shusky/audio/shiba/factory-audio-tables.mk
|
||||
# Override to factory SDK
|
||||
$(call soong_config_set, gpssdk, sdkv1, True)
|
||||
$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT))
|
||||
|
||||
PRODUCT_NAME := factory_shiba
|
||||
PRODUCT_DEVICE := shiba
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue