Snap for 12337407 from 867cea69d24e46c6730fdc1d4737f7b552dfec2c to 25Q1-release
Change-Id: I76184aff05acf3704f4a283f4b104b094570529f
diff --git a/device-oriole.mk b/device-oriole.mk
index e22fb6e..95cc084 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -17,6 +17,14 @@
# Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
+ifdef RELEASE_GOOGLE_ORIOLE_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
+
+
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION)
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
@@ -337,5 +345,13 @@
PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
# Bluetooth device id
+# Oriole: 0x4106
PRODUCT_PRODUCT_PROPERTIES += \
- bluetooth.device_id.product_id=20486
+ bluetooth.device_id.product_id=16646
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
diff --git a/device-raven.mk b/device-raven.mk
index e1c2b1b..4ceb39e 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -17,6 +17,14 @@
# Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
+ifdef RELEASE_GOOGLE_RAVEN_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR))
+
+
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RAVEN_VERSION)
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RAVEN_DIR)
@@ -347,5 +355,13 @@
PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
# Bluetooth device id
+# Raven: 0x4107
PRODUCT_PRODUCT_PROPERTIES += \
- bluetooth.device_id.product_id=20487
+ bluetooth.device_id.product_id=16647
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
diff --git a/device-slider.mk b/device-slider.mk
index 09eb645..9a51f6f 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -14,6 +14,10 @@
# limitations under the License.
#
+RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
+
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
diff --git a/device-whitefin.mk b/device-whitefin.mk
index f7e19c3..c9be012 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -14,6 +14,10 @@
# limitations under the License.
#
+RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
+
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole
index 876e529..f442e3a 100644
--- a/location/gps.6.1.xml.oriole
+++ b/location/gps.6.1.xml.oriole
@@ -99,6 +99,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven
index 0e0def8..3726311 100644
--- a/location/gps.6.1.xml.raven
+++ b/location/gps.6.1.xml.raven
@@ -99,6 +99,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps.xml b/location/gps.xml
index 41b8c48..76eb81e 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -99,6 +99,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole
index 324c0f2..1171998 100644
--- a/location/gps.xml.oriole
+++ b/location/gps.xml.oriole
@@ -99,6 +99,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps.xml.raven b/location/gps.xml.raven
index 9e067d4..8ca7eeb 100644
--- a/location/gps.xml.raven
+++ b/location/gps.xml.raven
@@ -99,6 +99,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole
index a5e6383..ccea80d 100644
--- a/location/gps_user.6.1.xml.oriole
+++ b/location/gps_user.6.1.xml.oriole
@@ -97,6 +97,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven
index 11a47a5..2230ace 100644
--- a/location/gps_user.6.1.xml.raven
+++ b/location/gps_user.6.1.xml.raven
@@ -97,6 +97,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 5aaf918..405b8b6 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -97,6 +97,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole
index 414fee5..c29ae2c 100644
--- a/location/gps_user.xml.oriole
+++ b/location/gps_user.xml.oriole
@@ -97,6 +97,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven
index f6775ad..41d38c9 100644
--- a/location/gps_user.xml.raven
+++ b/location/gps_user.xml.raven
@@ -97,6 +97,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index 757ee50..d77c0ef 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -24,11 +24,6 @@
BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
-RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
-
ifdef AUTOMOTIVE_PRODUCT_PATH
#RBC# include_top device/google/auto_tcu
#RBC# include_top device/google/pixel_tcu
@@ -47,4 +42,11 @@
include device/google/gs101-sepolicy/oriole-sepolicy.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index 06f97ae..3d474b6 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -24,11 +24,6 @@
BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR)
-RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR))
-
ifdef AUTOMOTIVE_PRODUCT_PATH
#RBC# include_top device/google/auto_tcu
#RBC# include_top device/google/pixel_tcu
@@ -47,4 +42,11 @@
include device/google/gs101-sepolicy/raven-sepolicy.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk
index 917b79a..2224d56 100644
--- a/slider/BoardConfig.mk
+++ b/slider/BoardConfig.mk
@@ -15,9 +15,6 @@
#
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := slider
-RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
TARGET_SCREEN_DENSITY := 560
USES_DEVICE_GOOGLE_RAVIOLE := true
@@ -26,3 +23,4 @@
include device/google/gs101/BoardConfig-common.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk
index e28f7bf..27f7c98 100644
--- a/whitefin/BoardConfig.mk
+++ b/whitefin/BoardConfig.mk
@@ -15,9 +15,6 @@
#
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := whitefin
-RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
TARGET_SCREEN_DENSITY := 440
USES_DEVICE_GOOGLE_RAVIOLE := true
@@ -26,3 +23,4 @@
include device/google/gs101/BoardConfig-common.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk