diff --git a/aoc/sepolicy/file_contexts b/aoc/sepolicy/file_contexts index 65f4aa5..fef8d73 100644 --- a/aoc/sepolicy/file_contexts +++ b/aoc/sepolicy/file_contexts @@ -22,6 +22,7 @@ /dev/aoc u:object_r:aoc_device:s0 /dev/acd-audio_ap_offload_rx u:object_r:aoc_device:s0 /dev/acd-audio_ap_offload_tx u:object_r:aoc_device:s0 +/dev/acd-mel_processor u:object_r:aoc_device:s0 # AoC vendor binaries /vendor/bin/aocd u:object_r:aocd_exec:s0 diff --git a/gps/brcm/device.mk b/gps/brcm/device.mk index c61897b..73d0492 100644 --- a/gps/brcm/device.mk +++ b/gps/brcm/device.mk @@ -2,6 +2,10 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/brcm/sepolicy PRODUCT_SOONG_NAMESPACES += device/google/gs-common/gps/brcm/prebuilt +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + $(call soong_config_set, SensorHub_debug, assertion, true) +endif + PRODUCT_PACKAGES += \ bcm47765_gps_package \ android.hardware.location.gps.prebuilt.xml diff --git a/gps/brcm/device_v2.mk b/gps/brcm/device_v2.mk index 60e62b3..5de9b61 100644 --- a/gps/brcm/device_v2.mk +++ b/gps/brcm/device_v2.mk @@ -2,6 +2,10 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/brcm/sepolicy PRODUCT_SOONG_NAMESPACES += vendor/broadcom/gps/bcm47765 +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + $(call soong_config_set, gpsv2, assertion, true) +endif + PRODUCT_PACKAGES += \ bcm47765_gps_package_v2 \ android.hardware.location.gps.prebuilt.xml diff --git a/gps/brcm/prebuilt/Android.bp b/gps/brcm/prebuilt/Android.bp index b20f90e..fce0344 100644 --- a/gps/brcm/prebuilt/Android.bp +++ b/gps/brcm/prebuilt/Android.bp @@ -15,15 +15,8 @@ cc_prebuilt_library_shared { srcs: ["android.hardware.gnss@2.1-impl-google.so"], shared_libs: [ "liblog", - "libhidlbase", - // "libhidltransport", "libutils", - "android.hardware.gnss@1.0", - "android.hardware.gnss@1.1", - "android.hardware.gnss@2.0", - "android.hardware.gnss@2.1", - "android.hardware.gnss.measurement_corrections@1.0", - "android.hardware.gnss.visibility_control@1.0", + "libbinder_ndk", "android.hardware.gnss-V3-ndk", "libhardware", "libc++", @@ -53,12 +46,8 @@ cc_prebuilt_binary { "liblog", "libutils", "libhardware", - "android.hardware.gnss@1.0", "libhidlbase", - // "libhidltransport", - // "libhwbinder", - "android.hardware.gnss@1.1", - "android.hardware.gnss@2.0", + "libbinder_ndk", "android.hardware.gnss@2.1", "android.hardware.gnss-V3-ndk", "libc++", @@ -178,8 +167,6 @@ cc_prebuilt_binary { "libc", "libm", "libz", - "android.hardware.contexthub@1.0", - "libhidlbase", "libdl", ], }, @@ -198,7 +185,7 @@ cc_prebuilt_binary { arm64: { srcs: ["scd"], shared_libs: [ - "liblog", + "liblog", "libutils", "libssl", "libcrypto", @@ -214,10 +201,30 @@ cc_prebuilt_binary { }, } -prebuilt_firmware { +soong_config_module_type { + name: "gps_prebuilt_firmware", + module_type: "prebuilt_firmware", + config_namespace: "SensorHub_debug", + bool_variables: [ + "assertion", + ], + properties: [ + "src" + ], +} + +gps_prebuilt_firmware { name: "SensorHub.patch", - src: "SensorHub.patch", + soong_config_variables: { + assertion: { + src: "SensorHub_DebugBuild_A0.patch", + conditions_default: { + src: "SensorHub_A0.patch" + }, + }, + }, vendor: true, + filename: "SensorHub.patch" } phony { diff --git a/gps/brcm/prebuilt/SensorHub_A0.patch b/gps/brcm/prebuilt/SensorHub_A0.patch new file mode 100644 index 0000000..70ea482 --- /dev/null +++ b/gps/brcm/prebuilt/SensorHub_A0.patch @@ -0,0 +1,7027 @@ + + + + + + + + + + + + + + diff --git a/gps/brcm/prebuilt/SensorHub.patch b/gps/brcm/prebuilt/SensorHub_DebugBuild_A0.patch similarity index 99% rename from gps/brcm/prebuilt/SensorHub.patch rename to gps/brcm/prebuilt/SensorHub_DebugBuild_A0.patch index 9ee3e90..d9d0e36 100644 --- a/gps/brcm/prebuilt/SensorHub.patch +++ b/gps/brcm/prebuilt/SensorHub_DebugBuild_A0.patch @@ -1,13 +1,13 @@ - + - + - +