From c44cfe952ded152696789590516fa864fe2f3bb8 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 7 Mar 2024 10:00:20 -0800 Subject: [PATCH 1/2] Use soong_config_get/set instead of raw variable accesses The raw variable accesses are breaking the rbc product config CI. Test: ./build/bazel/ci/rbc_dashboard.py --quick factory_husky-trunk_staging-userdebug factory_ripcurrent factory_shiba Change-Id: Ied0b29d9eeae65fb94900258627247b0a4145bc5 --- gps/brcm/device.mk | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gps/brcm/device.mk b/gps/brcm/device.mk index 3065542..45b4eb0 100644 --- a/gps/brcm/device.mk +++ b/gps/brcm/device.mk @@ -1,14 +1,12 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/brcm/sepolicy PRODUCT_SOONG_NAMESPACES += vendor/broadcom/gps/bcm47765 - -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += sdkv1 -SOONG_CONFIG_gpssdk_sdkv1 ?= false - -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsmcuversion -SOONG_CONFIG_gpssdk_gpsmcuversion ?= gpsv2_$(TARGET_BUILD_VARIANT) +ifeq (,$(call soong_config_get,gpssdk,sdkv1)) + $(call soong_config_set,gpssdk,sdkv1,false) +endif +ifeq (,$(call soong_config_get,gpssdk,gpsmcuversion)) + $(call soong_config_set,gpssdk,gpsmcuversion,gpsv2_$(TARGET_BUILD_VARIANT)) +endif PRODUCT_PACKAGES += \ bcm47765_gps_package \ From b878885499217edd26b12c0493f504a7e5c524a2 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 6 Mar 2024 21:28:10 +0000 Subject: [PATCH 2/2] sepolicy: allow setprop for thermal_controld selinux denied log: [ 53.774820] type=1400 audit(1709683991.036:9): avc: denied { write } for comm="setprop" name="property_service" dev="tmpfs" ino=842 scontext=u:r:pixel-thermal-control-sh:s0 tcontext=u:object_r:property_socket:s0 tclass=sock_file permissive=0 Bug: 328118301 Test: adb shell getprop vendor.disable.thermalhal.control Change-Id: I590f05d1119d11400b0115fff63b3420790e7332 --- thermal/sepolicy/thermal_hal/pixel-thermal-control.sh.te | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thermal/sepolicy/thermal_hal/pixel-thermal-control.sh.te b/thermal/sepolicy/thermal_hal/pixel-thermal-control.sh.te index a6430f1..df699fc 100644 --- a/thermal/sepolicy/thermal_hal/pixel-thermal-control.sh.te +++ b/thermal/sepolicy/thermal_hal/pixel-thermal-control.sh.te @@ -9,5 +9,5 @@ userdebug_or_eng(` allow pixel-thermal-control-sh sysfs_thermal:file rw_file_perms; allow pixel-thermal-control-sh sysfs_thermal:lnk_file r_file_perms; allow pixel-thermal-control-sh thermal_link_device:dir r_dir_perms; - get_prop(pixel-thermal-control-sh, vendor_thermal_prop) + set_prop(pixel-thermal-control-sh, vendor_thermal_prop) ')