Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "refactor gps build system" into udc-qpr-dev am: 23dcb1e9d2 am: c030f4d55c

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24270484

Change-Id: Ibf0d2d81b7321757be7276bbf2c8c0ddacc18f6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cheng Chang 2023-08-23 19:14:56 +00:00 • committed by Automerger Merge Worker
commit 6247c28e7f
6 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
device-husky.mk
View file

@ -249,14 +249,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

9
device-ripcurrent.mk
View file

@ -207,14 +207,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

9
device-shiba.mk
View file

@ -239,14 +239,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

3
factory_husky.mk
View file

@ -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

3
factory_ripcurrent.mk
View file

@ -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

3
factory_shiba.mk
View file

@ -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