summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-12-08 13:13:39 -0800
committerXin Li <delphij@google.com>2023-12-08 13:13:39 -0800
commit7357a6d908d6b6f7be4b56c2ed8d740499e8e420 (patch)
tree678b97eba36fd73552c787c52017cb2a3095dbb4
parent7836246080556a458f7eae03c0917421bb1a6317 (diff)
parente98cd7e63997546dbcea737fd0f3c74bbec402c4 (diff)
downloadredbull-7357a6d908d6b6f7be4b56c2ed8d740499e8e420.tar.gz
Merge Android 14 QPR1
Merged-In: Ica6451a43ad9fd345ddb7443b8ea2c26d12adef2 Bug: 315507370 Change-Id: I2cb620d3e1e55896eb1eb9a7c23f1a23ac127aac
-rw-r--r--BoardConfig-common.mk2
-rw-r--r--device-common.mk5
-rw-r--r--init.hardware.rc1
3 files changed, 7 insertions, 1 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index d2369785..42271d90 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -428,6 +428,8 @@ WIFI_FEATURE_WIFI_EXT_HAL := true
WIFI_FEATURE_IMU_DETECTION := true
WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true
+# Add WIFI_FEATURE_IMU_DETECTION to soong_config
+$(call soong_config_set,wifi,feature_imu_detection,$(WIFI_FEATURE_IMU_DETECTION))
# Audio
BOARD_USES_ALSA_AUDIO := true
diff --git a/device-common.mk b/device-common.mk
index 47bfc8fd..a3fb90ee 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -842,7 +842,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER)
# Increment the SVN for any official public releases
ifeq ($(PRODUCT_DEVICE_SVN_OVERRIDE),)
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=74
+ ro.vendor.build.svn=75
endif
# Enable iwlan service logging for debug
@@ -1018,6 +1018,9 @@ endif
# Project
include hardware/google/pixel/common/pixel-common-device.mk
+# gs-common
+include device/google/gs-common/misc_writer/misc_writer.mk
+
# Citadel
include hardware/google/pixel/citadel/citadel.mk
diff --git a/init.hardware.rc b/init.hardware.rc
index db681cb8..669c8ddd 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -661,6 +661,7 @@ on post-fs-data && property:persist.vendor.sys.ssr.enable_ramdumps=1 && property
mkdir /data/vendor/wifidump 771 root system
mkdir /data/vendor/ramdump 771 root system
mkdir /data/vendor/ssrdump 771 root system
+ mkdir /data/vendor/ssrdump/coredump 771 root system
mkdir /data/vendor/ssrlog 775 root system
start vendor.ss_ramdump