fixup! Disable userdebug diagnostics

Change-Id: I9ec35b51e3414bded1945b7035372d91ef960414
Skip gyotaku_app for lineage builds
2024-09-07 16:34:17 +03:00 · 2024-06-15 22:31:53 +03:00 · 2024-06-15 22:26:04 +03:00 · 2024-04-25 15:34:27 +03:00 · 2024-04-24 20:03:50 +03:00 · 2024-03-10 07:29:44 +02:00
489 changed files with 387 additions and 4313 deletions
--- a/11
+++ b/11
@@ -1,11 +0,0 @@
-# NOTE: CHANGE THIS FILE WITH CAUTIOUS
-# - this file is referenced by other OWNERS file, e.g. device/google/*/OWNERS
-# - changing this file might break the function, check go/gerrit-code-owners-syntax first
-
-jaegeuk@google.com
-huangrandall@google.com
-bvanassche@google.com
-daehojeong@google.com
-chullee@google.com
-vkon@google.com
-thomasyen@google.com
--- a/20
+++ b/20
@@ -1,20 +0,0 @@
-# NOTE: CHANGE THIS FILE WITH CAUTIOUS
-# - this file is referenced by other OWNERS file, e.g. device/google/*/OWNERS
-# - changing this file might break the function, check go/gerrit-code-owners-syntax first
-#
-# Makefile Review Guide for OWNERS: go/pixel-device-mk-owner-checklist
-
-aaronding@google.com
-rurumihong@google.com
-adamshih@google.com
-wilsonsung@google.com
-cyanhsieh@google.com
-cyuanjen@google.com
-robinpeng@google.com
-achant@google.com
-etam@google.com
-pattjin@google.com
-bkhalife@google.com
-lokeshgoel@google.com
-jainne@google.com
-pscovanner@google.com
--- a/5
+++ b/5
@@ -1,5 +1,6 @@

 per-file *.te,*_contexts,te_macros,global_macros=set noparent
 per-file *.te,*_contexts,te_macros,global_macros=file:/sepolicy/OWNERS
-per-file *.mk,{**/,}Android.bp=set noparent
-per-file *.mk,{**/,}Android.bp=file:MK_OWNERS
+per-file *.mk=set noparent
+per-file *.mk=aaronding@google.com,rurumihong@google.com,adamshih@google.com,wilsonsung@google.com,cyanhsieh@google.com,cyuanjen@google.com,robinpeng@google.com,achant@google.com,etam@google.com,pattjin@google.com,bkhalife@google.com,lokeshgoel@google.com,jainne@google.com,pscovanner@google.com
+
--- a/aoc/aoc.mk
+++ b/aoc/aoc.mk
@@ -4,19 +4,22 @@ PRODUCT_PACKAGES += dump_aoc \
 		    aocd \
 		    aocxd

+ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
+# IAudioMetricExt HIDL
+PRODUCT_PACKAGES += \
+    vendor.google.audiometricext@1.0-service-vendor
+endif
+
 # If AoC Daemon is not present on this build, load firmware at boot via rc
 PRODUCT_COPY_FILES += \
 	device/google/gs-common/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc

-ifneq ($(wildcard vendor/google/whitechapel/aoc/aocx/aidl/aocx/framework_compatibility_matrix.xml),)
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \
-    vendor/google/whitechapel/aoc/aocx/aidl/aocx/framework_compatibility_matrix.xml
-endif
-
 # AoC debug support
-PRODUCT_PACKAGES_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
 	aocdump \
 	aocutil \
 	aoc_audio_cfg \
 	vp_util \
 	aocx_tool
+endif
--- a/aoc/dump_aoc.cpp
+++ b/aoc/dump_aoc.cpp
@@ -29,10 +29,9 @@ int main() {
    runCommand("AoC logging wake", "timeout 0.1 cat /sys/devices/platform/*.aoc/control/logging_wakeup");
    runCommand("AoC hotword wake", "timeout 0.1 cat /sys/devices/platform/*.aoc/control/hotword_wakeup");
    runCommand("AoC memory exception wake", "timeout 0.1 cat /sys/devices/platform/*.aoc/control/memory_exception");
-    runCommand("AoC memory votes", "timeout 0.5 cat /sys/devices/platform/*.aoc/control/memory_votes_a32");
-    runCommand("AoC memory votes", "timeout 0.5 cat /sys/devices/platform/*.aoc/control/memory_votes_ff1");
+    runCommand("AoC memory votes", "timeout 0.1 cat /sys/devices/platform/*.aoc/control/memory_votes_a32");
+    runCommand("AoC memory votes", "timeout 0.1 cat /sys/devices/platform/*.aoc/control/memory_votes_ff1");
    runCommand("clean AoC buffer","echo ' ' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
-    runCommand("AoC DVFS (A32)", "echo 'dbg info -c 1 DVFSA32' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
    runCommand("AoC DVFS (FF1)", "echo 'dbg info -c 2 DVFSFF1' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
    runCommand("AoC Monitor Mode Status", "echo 'monitor_mode status' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug");
    return 0;
--- a/aoc/sepolicy/aocxd.te
+++ b/aoc/sepolicy/aocxd.te
@@ -26,6 +26,3 @@ add_service(aocxd, aocx);

 # allow managing thread priority
 allow aocxd self:global_capability_class_set sys_nice;
-
-allow aocxd dumpstate:fd use;
-allow aocxd dumpstate:fifo_file write;
--- a/aoc/sepolicy/dumpstate.te
+++ b/aoc/sepolicy/dumpstate.te
@@ -1,2 +0,0 @@
-# Allow dumpstate to talk to aocxd over binder
-binder_call(dumpstate, aocxd)
--- a/aoc/sepolicy/file_contexts
+++ b/aoc/sepolicy/file_contexts
@@ -28,15 +28,7 @@
 /dev/acd-audio_ap_offload_tx        u:object_r:aoc_device:s0
 /dev/acd-mel_processor              u:object_r:aoc_device:s0
 /dev/acd-aocx_control               u:object_r:aoc_device:s0
-/dev/acd-aocx_inject[0-9]*          u:object_r:aoc_device:s0
-/dev/acd-aocx_tapout[0-9]*          u:object_r:aoc_device:s0
 /dev/acd-mc_headpos                 u:object_r:aoc_device:s0
-/dev/acd-chre_bt_offload_ctl        u:object_r:aoc_device:s0
-/dev/acd-chre_bt_offload_data_tx    u:object_r:aoc_device:s0
-/dev/acd-chre_bt_offload_data_rx    u:object_r:aoc_device:s0
-/dev/acd-chre_ctl                   u:object_r:aoc_device:s0
-/dev/acd-chre_data_tx               u:object_r:aoc_device:s0
-/dev/acd-chre_data_rx               u:object_r:aoc_device:s0

 # AoC vendor binaries
 /vendor/bin/aocd                    u:object_r:aocd_exec:s0
--- a/aoc/sepolicy/service.te
+++ b/aoc/sepolicy/service.te
@@ -1 +0,0 @@
-type aocx, service_manager_type;
--- a/aoc/sepolicy/service_contexts
+++ b/aoc/sepolicy/service_contexts
@@ -1 +0,0 @@
-aocx.IAocx/default    u:object_r:aocx:s0
--- a/aoc/sepolicy/vndservice.te
+++ b/aoc/sepolicy/vndservice.te
@@ -0,0 +1 @@
+type aocx, vndservice_manager_type;
--- a/aoc/sepolicy/vndservice_contexts
+++ b/aoc/sepolicy/vndservice_contexts
@@ -0,0 +1 @@
+aocx.IAocx    u:object_r:aocx:s0
--- a/audio/aidl.mk
+++ b/audio/aidl.mk
@@ -6,6 +6,9 @@ PRODUCT_PACKAGES += \
    android.hardware.audio.service-aidl.aoc \
    vendor.google.whitechapel.audio.hal.parserservice \

+# AIDL software effects. These are the effects supporting in all projects.
+# For the project-specific effects, such as haptic generator, please add them
+# to makefile in the project's device folder.
 PRODUCT_PACKAGES += \
    libvisualizeraidl \
    libbundleaidl \
@@ -13,14 +16,9 @@ PRODUCT_PACKAGES += \
    libdynamicsprocessingaidl \
    libloudnessenhanceraidl \
    libdownmixaidl \
-    libhapticgeneratoraidl \

 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/aidl
-ifeq ($(AUDIO_USE_DPTX_SEPOLICY),true)
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hdmi_audio/dptx
-else
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hdmi_audio/drmdp
-endif
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hdmi_audio

 include device/google/gs-common/audio/common.mk

@@ -31,11 +29,4 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_SYSTEM_EXT_PROPERTIES += \
       ro.audio.ihaladaptervendorextension_enabled=true

-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-$(call soong_config_set,aoc_audio_func,dump_usecase_data,true)
-$(call soong_config_set,aoc_audio_func,hal_socket_control,true)
-$(call soong_config_set,aoc_audio_func,record_tuning_keys,true)
-$(call soong_config_set,aoc_audio_func,aidl_command_interface,true)
-endif
-
 $(call soong_config_set,pixel_audio_hal_type,aidl_build,true)
--- a/audio/aidl/device_framework_matrix_product.xml
+++ b/audio/aidl/device_framework_matrix_product.xml
@@ -1,7 +1,15 @@
 <compatibility-matrix version="1.0" type="framework">
+    <hal format="hidl">
+       <name>vendor.google.audiometricext</name>
+       <version>1.0</version>
+       <interface>
+           <name>IAudioMetricExt</name>
+           <instance>default</instance>
+       </interface>
+    </hal>
    <hal format="aidl">
        <name>vendor.google.whitechapel.audio.extension</name>
-        <version>4</version>
+        <version>1</version>
        <interface>
            <name>IAudioExtension</name>
            <instance>default</instance>
--- a/audio/aidl/manifest.xml
+++ b/audio/aidl/manifest.xml
@@ -1,2 +1,11 @@
 <manifest version="1.0" type="device">
+    <hal format="hidl">
+       <name>vendor.google.audiometricext</name>
+       <transport>hwbinder</transport>
+       <version>1.0</version>
+       <interface>
+           <name>IAudioMetricExt</name>
+           <instance>default</instance>
+       </interface>
+    </hal>
 </manifest>
--- a/audio/common.mk
+++ b/audio/common.mk
@@ -3,15 +3,8 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/common
 #Audio Vendor libraries
 PRODUCT_PACKAGES += \
 	libfvsam_prm_parser \
-	libmahalcontroller
-
-ifeq ($(USE_MAM_V4_ABOVE),true)
-PRODUCT_PACKAGES += \
-	libMAM_Google_Pixel_Android
-else
-PRODUCT_PACKAGES += \
+	libmahalcontroller \
 	libAlgFx_HiFi3z
-endif

 ifneq ($(USE_AUDIO_HAL_AIDL),true)
 ## AudioHAL Configurations
--- a/audio/hidl_gs101.mk
+++ b/audio/hidl_gs101.mk
@@ -32,14 +32,8 @@ PRODUCT_PACKAGES += \
 	libamcsextfile \
 	audio_amcs_ext \

-ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
-# IAudioMetricExt HIDL
-PRODUCT_PACKAGES += \
-	vendor.google.audiometricext@1.0-service-vendor
-endif
-
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl

 include device/google/gs-common/audio/common.mk

-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/audio/hidl/device_framework_matrix_product_gs101.xml
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/audio/hidl/device_framework_matrix_product_gs101.xml
--- a/audio/hidl_gs201.mk
+++ b/audio/hidl_gs201.mk
@@ -32,12 +32,6 @@ PRODUCT_PACKAGES += \
 	audio_spk_35l41 \
 	sound_trigger.primary.$(TARGET_BOARD_PLATFORM)

-ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
-# IAudioMetricExt HIDL
-PRODUCT_PACKAGES += \
-	vendor.google.audiometricext@1.0-service-vendor
-endif
-
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl

 include device/google/gs-common/audio/common.mk
--- a/audio/hidl_zuma.mk
+++ b/audio/hidl_zuma.mk
@@ -35,14 +35,8 @@ PRODUCT_PACKAGES += \
 	audio_hdmi_aoc \
 	sound_trigger.primary.$(TARGET_BOARD_PLATFORM)

-ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
-# IAudioMetricExt HIDL
-PRODUCT_PACKAGES += \
-	vendor.google.audiometricext@1.0-service-vendor
-endif
-
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hidl
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hdmi_audio/drmdp
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/audio/sepolicy/hdmi_audio

 include device/google/gs-common/audio/common.mk

--- a/audio/sepolicy/aidl/hal_audio_default.te
+++ b/audio/sepolicy/aidl/hal_audio_default.te
@@ -1,4 +1 @@
 add_service(hal_audio_default, hal_audio_ext_service)
-# Allow audio-hal to register battery_mitigation service
-allow hal_audio_default hal_battery_mitigation_service:service_manager find;
-binder_call(hal_audio_default, battery_mitigation)
--- a/audio/sepolicy/common/genfs_contexts
+++ b/audio/sepolicy/common/genfs_contexts
@@ -21,4 +21,3 @@ genfscon sysfs /devices/platform/audiometrics/call_count                    u:ob
 genfscon sysfs /devices/platform/audiometrics/offload_effects_id            u:object_r:sysfs_pixelstats:s0
 genfscon sysfs /devices/platform/audiometrics/offload_effects_duration      u:object_r:sysfs_pixelstats:s0
 genfscon sysfs /devices/platform/audiometrics/bt_usage                      u:object_r:sysfs_pixelstats:s0
-genfscon sysfs /devices/platform/audiometrics/speaker_version               u:object_r:sysfs_pixelstats:s0
--- a/audio/sepolicy/common/hal_audio_default.te
+++ b/audio/sepolicy/common/hal_audio_default.te
@@ -1,4 +1,3 @@
-# allow access to folders
 allow hal_audio_default audio_vendor_data_file:dir rw_dir_perms;
 allow hal_audio_default audio_vendor_data_file:file create_file_perms;

@@ -13,9 +12,6 @@ allow hal_audio_default aoc_device:chr_file rw_file_perms;
 allow hal_audio_default amcs_device:file rw_file_perms;
 allow hal_audio_default amcs_device:chr_file rw_file_perms;
 allow hal_audio_default sysfs_pixelstats:file rw_file_perms;
-allow hal_audio_default sysfs_extcon:dir search;
-allow hal_audio_default sysfs_extcon:file r_file_perms;
-allow hal_audio_default vendor_usb_debugfs:dir search;

 #allow access to aoc and kernel boottime
 allow hal_audio_default sysfs_aoc:dir { search };
@@ -25,7 +21,6 @@ allow hal_audio_default sysfs_aoc_boottime:file r_file_perms;
 allow hal_audio_default dmabuf_heap_device:chr_file r_file_perms;

 set_prop(hal_audio_default, vendor_audio_prop);
-set_prop(hal_audio_default, vendor_audio_prop_restricted);

 hal_client_domain(hal_audio_default, hal_health);
 hal_client_domain(hal_audio_default, hal_thermal);
--- a/audio/sepolicy/common/property.te
+++ b/audio/sepolicy/common/property.te
@@ -1,5 +1,2 @@
 # Audio
 vendor_internal_prop(vendor_audio_prop)
-
-# The property for Audio App
-vendor_restricted_prop(vendor_audio_prop_restricted)
--- a/audio/sepolicy/common/property_contexts
+++ b/audio/sepolicy/common/property_contexts
@@ -1,6 +1,3 @@
-# for serial no
-vendor.audio_hal.device.serialno                u:object_r:vendor_audio_prop:s0
-
 # for audio
 vendor.audio_hal.period_multiplier              u:object_r:vendor_audio_prop:s0
 vendor.audiodump.enable                         u:object_r:vendor_audio_prop:s0
@@ -12,6 +9,3 @@ vendor.audiodump.encode.disable                 u:object_r:vendor_audio_prop:s0
 vendor.audiodump.log.cca.updated                u:object_r:vendor_audio_prop:s0
 vendor.audiodump.cca.config                     u:object_r:vendor_audio_prop:s0
 vendor.audio_hal.aidl.enable                    u:object_r:vendor_audio_prop:s0
-
-# for audio app
-persist.vendor.app.audio.                       u:object_r:vendor_audio_prop_restricted:s0
--- a/audio/sepolicy/common/vendor_init.te
+++ b/audio/sepolicy/common/vendor_init.te
@@ -1,5 +1,2 @@
 # Audio property
 set_prop(vendor_init, vendor_audio_prop)
-
-# Audio App property
-set_prop(vendor_init, vendor_audio_prop_restricted)
--- a/audio/sepolicy/hdmi_audio/dptx/genfs_contexts
+++ b/audio/sepolicy/hdmi_audio/dptx/genfs_contexts
@@ -1 +0,0 @@
-genfscon sysfs /devices/platform/dwc_dptx-audio/extcon/hdmi_audio             u:object_r:sysfs_extcon:s0
--- a/audio/sepolicy/hdmi_audio/drmdp/genfs_contexts
+++ b/audio/sepolicy/hdmi_audio/drmdp/genfs_contexts
--- a/battery_mitigation/sepolicy/vendor/battery_mitigation.te
+++ b/battery_mitigation/sepolicy/vendor/battery_mitigation.te
@@ -24,8 +24,6 @@ allow battery_mitigation sysfs_bcl:lnk_file r_file_perms;
 allow battery_mitigation sysfs_thermal:lnk_file r_file_perms;
 allow battery_mitigation mitigation_vendor_data_file:dir rw_dir_perms;
 allow battery_mitigation mitigation_vendor_data_file:file create_file_perms;
-allow battery_mitigation dumpstate:fd use;
-allow battery_mitigation dumpstate:fifo_file rw_file_perms;

 # Allow battery_mitigation to use Binder IPC so that service manager can notify it for callbacks
 binder_use(battery_mitigation)
@@ -33,6 +31,3 @@ binder_use(battery_mitigation)
 wakelock_use(battery_mitigation)
 # Allow battery_mitigation to run aidl service
 add_service(battery_mitigation, hal_battery_mitigation_service)
-# Allow battery_mitigation to run audio mitigation callback
-binder_call(battery_mitigation, hal_audio_default)
-binder_call(battery_mitigation, servicemanager)
--- a/battery_mitigation/sepolicy/vendor/dumpstate.te
+++ b/battery_mitigation/sepolicy/vendor/dumpstate.te
@@ -1,3 +0,0 @@
-# To call battery_mitigation hal
-allow dumpstate hal_battery_mitigation_service:service_manager find;
-binder_call(dumpstate, battery_mitigation);
--- a/battery_mitigation/sepolicy/vendor/service.te
+++ b/battery_mitigation/sepolicy/vendor/service.te
@@ -1 +1 @@
-type hal_battery_mitigation_service, hal_service_type, service_manager_type;
+type hal_battery_mitigation_service, protected_service, hal_service_type, service_manager_type;
--- a/bcmbt/bluetooth.mk
+++ b/bcmbt/bluetooth.mk
@@ -1,8 +1,6 @@
 PRODUCT_SOONG_NAMESPACES += vendor/broadcom/bluetooth
 PRODUCT_PACKAGES += \
       android.hardware.bluetooth-V1-ndk.so \
-       android.hardware.bluetooth.finder-V1-ndk.so \
-       android.hardware.bluetooth.ranging-V1-ndk.so \
       android.hardware.bluetooth-service.bcmbtlinux \
       vendor.google.bluetooth_ext-V1-ndk.so \
       bt_vendor.conf \
@@ -11,7 +9,6 @@ PRODUCT_PACKAGES += \


 BOARD_SEPOLICY_DIRS += device/google/gs-common/bcmbt/sepolicy
-BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats

 DEVICE_MANIFEST_FILE += device/google/gs-common/bcmbt/manifest_bluetooth.xml
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/bcmbt/compatibility_matrix.xml
--- a/bcmbt/compatibility_matrix.xml
+++ b/bcmbt/compatibility_matrix.xml
@@ -6,6 +6,7 @@
            <name>IBluetoothFinder</name>
            <instance>default</instance>
        </interface>
+        <fqname>IBluetoothFinder/default</fqname>
        <interface>
            <name>IBluetoothCcc</name>
            <instance>default</instance>
--- a/bcmbt/dump/dump_bcmbt.cpp
+++ b/bcmbt/dump/dump_bcmbt.cpp
@@ -34,8 +34,7 @@ int main() {
        return 0;
    }

-    dumpLogs(BCMBT_SNOOP_LOG_DIRECTORY, outputDir.c_str(), 4,
-             BCMBT_SNOOP_LOG_PREFIX);
+    dumpLogs(BCMBT_SNOOP_LOG_DIRECTORY, outputDir.c_str(), 2, BCMBT_SNOOP_LOG_PREFIX);
    dumpLogs(BCMBT_SNOOP_LOG_DIRECTORY, outputDir.c_str(), 2, BCMBT_BACKUP_SNOOP_LOG_PREFIX);
    dumpLogs(BCMBT_FW_LOG_DIRECTORY, outputDir.c_str(), 10, BCMBT_FW_DUMP_LOG_PREFIX);
    dumpLogs(BCMBT_FW_LOG_DIRECTORY, outputDir.c_str(), 10, BCMBT_CHRE_DUMP_LOG_PREFIX);
--- a/bcmbt/dump/dumplog.mk
+++ b/bcmbt/dump/dumplog.mk
@@ -1,3 +1,5 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/bcmbt/dump/sepolicy/

-PRODUCT_PACKAGES_ENG += dump_bcmbt
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += dump_bcmbt
+endif
--- a/bcmbt/manifest_bluetooth.xml
+++ b/bcmbt/manifest_bluetooth.xml
@@ -4,16 +4,6 @@
        <version>1</version>
        <fqname>IBluetoothHci/default</fqname>
    </hal>
-    <hal format="aidl">
-        <name>android.hardware.bluetooth.finder</name>
-        <version>1</version>
-        <fqname>IBluetoothFinder/default</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>android.hardware.bluetooth.ranging</name>
-        <version>1</version>
-        <fqname>IBluetoothChannelSounding/default</fqname>
-    </hal>
    <hal format="aidl">
        <name>vendor.google.bluetooth_ext</name>
        <version>1</version>
--- a/betterbug/betterbug.mk
+++ b/betterbug/betterbug.mk
@@ -1,8 +0,0 @@
-# When neither AOSP nor factory targets
-ifeq (,$(filter aosp_% factory_% lineage_%, $(TARGET_PRODUCT)))
-  PRODUCT_PACKAGES += BetterBugStub
-  PRODUCT_PACKAGES_DEBUG += $(RELEASE_PACKAGE_BETTER_BUG)
-endif
-
-PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs-common/betterbug/sepolicy/product/public
-PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs-common/betterbug/sepolicy/product/private
--- a/betterbug/sepolicy/product/private/better_bug_app.te
+++ b/betterbug/sepolicy/product/private/better_bug_app.te
@@ -1,47 +0,0 @@
-typeattribute better_bug_app coredomain;
-
-app_domain(better_bug_app)
-net_domain(better_bug_app)
-
-allow better_bug_app app_api_service:service_manager find;
-allow better_bug_app mediaserver_service:service_manager find;
-allow better_bug_app radio_service:service_manager find;
-allow better_bug_app system_api_service:service_manager find;
-
-allow better_bug_app privapp_data_file:file execute;
-allow better_bug_app privapp_data_file:lnk_file r_file_perms;
-allow better_bug_app shell_data_file:file r_file_perms;
-allow better_bug_app shell_data_file:dir r_dir_perms;
-
-# Allow traceur to pass file descriptors through a content provider to betterbug
-allow better_bug_app trace_data_file:file { getattr read };
-
-# Allow betterbug to read profile reports generated by profcollect.
-userdebug_or_eng(`
-  allow better_bug_app profcollectd_data_file:file r_file_perms;
-')
-
-# Allow BetterBug access to WM traces attributes
-allow better_bug_app wm_trace_data_file:dir r_dir_perms;
-allow better_bug_app wm_trace_data_file:file getattr;
-
-# Allow the bug reporting frontend to read the presence and timestamp of the
-# trace attached to the bugreport (but not its contents, which will go in the
-# usual bugreport .zip file). This is used by the bug reporting UI to tell if
-# the bugreport will contain a system trace or not while the bugreport is still
-# in progress.
-allow better_bug_app perfetto_traces_bugreport_data_file:dir r_dir_perms;
-allow better_bug_app perfetto_traces_bugreport_data_file:file { getattr };
-
-# Allow BetterBug to receive Perfetto traces through the framework
-# (i.e. TracingServiceProxy) and sendfile them into their private
-# directories for reporting when network and battery conditions are
-# appropriate.
-allow better_bug_app perfetto:fd use;
-allow better_bug_app perfetto_traces_data_file:file { read getattr };
-
-# Allow BetterBug to set property to start vendor.touch_dumpstate
-set_prop(better_bug_app, ctl_start_prop)
-
-# Allow BetterBug to read system boot reason
-get_prop(better_bug_app, system_boot_reason_prop)
--- a/betterbug/sepolicy/product/private/seapp_contexts
+++ b/betterbug/sepolicy/product/private/seapp_contexts
@@ -1,2 +0,0 @@
-# BetterBug
-user=_app isPrivApp=true name=com.google.android.apps.internal.betterbug domain=better_bug_app type=privapp_data_file levelFrom=user
--- a/betterbug/sepolicy/product/public/better_bug_app.te
+++ b/betterbug/sepolicy/product/public/better_bug_app.te
@@ -1 +0,0 @@
-type better_bug_app, domain;
--- a/bluetooth/bluetooth.mk
+++ b/bluetooth/bluetooth.mk
@@ -1,16 +0,0 @@
-PRODUCT_SOONG_NAMESPACES += vendor/google/connectivity/bluetooth/common
-PRODUCT_PACKAGES += \
-       android.hardware.bluetooth-V1-ndk.so \
-       android.hardware.bluetooth.finder-V1-ndk.so \
-       android.hardware.bluetooth.ranging-V1-ndk.so \
-       android.hardware.bluetooth-service.pixel \
-       vendor.google.bluetooth_ext-V1-ndk.so \
-       bt_vendor.conf \
-       android.hardware.bluetooth.prebuilt.xml \
-       android.hardware.bluetooth_le.prebuilt.xml
-
-BOARD_SEPOLICY_DIRS += device/google/gs-common/bluetooth/sepolicy
-BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats
-
-DEVICE_MANIFEST_FILE += device/google/gs-common/bluetooth/manifest_bluetooth.xml
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/bluetooth/compatibility_matrix.xml
--- a/bluetooth/compatibility_matrix.xml
+++ b/bluetooth/compatibility_matrix.xml
@@ -1,30 +0,0 @@
-<compatibility-matrix version="1.0" type="framework">
-    <hal format="aidl" optional="true">
-        <name>vendor.google.bluetooth_ext</name>
-        <version>1</version>
-        <interface>
-            <name>IBluetoothFinder</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IBluetoothCcc</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IBTChannelAvoidance</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IBluetoothSar</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IBluetoothExt</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IBluetoothEwp</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</compatibility-matrix>
--- a/bluetooth/dump/Android.bp
+++ b/bluetooth/dump/Android.bp
@@ -1,20 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_binary {
-    name: "dump_bt",
-    srcs: ["dump.cpp"],
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
-    ],
-    shared_libs: [
-        "libbase",
-        "libdump",
-        "liblog",
-    ],
-    vendor: true,
-    relative_install_path: "dump",
-}
--- a/bluetooth/dump/dump.cpp
+++ b/bluetooth/dump/dump.cpp
@@ -1,44 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <dump/pixel_dump.h>
-#include <android-base/file.h>
-
-#define PIXELBT_ACTIVITY_LOG_DIRECTORY "/data/vendor/bluetooth"
-#define PIXELBT_SNOOP_LOG_DIRECTORY "/data/vendor/bluetooth"
-#define PIXELBT_FW_LOG_DIRECTORY "/data/vendor/ssrdump/coredump"
-#define PIXELBT_SNOOP_LOG_PREFIX "btsnoop_hci_vnd"
-#define PIXELBT_BACKUP_SNOOP_LOG_PREFIX "backup_btsnoop_hci_vnd"
-#define PIXELBT_FW_DUMP_LOG_PREFIX "coredump_bt_socdump_"
-#define PIXELBT_CHRE_DUMP_LOG_PREFIX "coredump_bt_chredump_"
-#define PIXELBT_HAL_DUMP_LOG_PREFIX "coredump_bt_"
-#define PIXELBT_ACTIVITY_LOG_PREFIX "bt_activity_"
-
-int main() {
-    std::string outputDir = concatenatePath(BUGREPORT_PACKING_DIR, "bt");
-    if (mkdir(outputDir.c_str(), 0777) == -1) {
-        printf("Unable to create folder: %s\n", outputDir.c_str());
-        return 0;
-    }
-
-    dumpLogs(PIXELBT_SNOOP_LOG_DIRECTORY, outputDir.c_str(), 4,
-             PIXELBT_SNOOP_LOG_PREFIX);
-    dumpLogs(PIXELBT_SNOOP_LOG_DIRECTORY, outputDir.c_str(), 2, PIXELBT_BACKUP_SNOOP_LOG_PREFIX);
-    dumpLogs(PIXELBT_FW_LOG_DIRECTORY, outputDir.c_str(), 10, PIXELBT_FW_DUMP_LOG_PREFIX);
-    dumpLogs(PIXELBT_FW_LOG_DIRECTORY, outputDir.c_str(), 10, PIXELBT_CHRE_DUMP_LOG_PREFIX);
-    dumpLogs(PIXELBT_FW_LOG_DIRECTORY, outputDir.c_str(), 10, PIXELBT_HAL_DUMP_LOG_PREFIX);
-    dumpLogs(PIXELBT_ACTIVITY_LOG_DIRECTORY, outputDir.c_str(), 10, PIXELBT_ACTIVITY_LOG_PREFIX);
-    return 0;
-}
--- a/bluetooth/dump/dumplog.mk
+++ b/bluetooth/dump/dumplog.mk
@@ -1,3 +0,0 @@
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/bluetooth/dump/sepolicy/
-
-PRODUCT_PACKAGES_DEBUG += dump_bt
--- a/bluetooth/dump/sepolicy/dump.te
+++ b/bluetooth/dump/sepolicy/dump.te
@@ -1,12 +0,0 @@
-# pixel bluetooth common hal service
-pixel_bugreport(dump_bt)
-
-allow hal_dumpstate_default vendor_bt_data_file:dir { open read search };
-allow hal_dumpstate_default vendor_bt_data_file:file read;
-allow dump_bt radio_vendor_data_file:dir create_dir_perms;
-allow dump_bt radio_vendor_data_file:file create_file_perms;
-allow dump_bt vendor_bt_data_file:dir r_dir_perms;
-allow dump_bt vendor_bt_data_file:file r_file_perms;
-allow dump_bt sscoredump_vendor_data_crashinfo_file:dir search;
-allow dump_bt sscoredump_vendor_data_coredump_file:dir r_dir_perms;
-allow dump_bt sscoredump_vendor_data_coredump_file:file r_file_perms;
--- a/bluetooth/dump/sepolicy/file_contexts
+++ b/bluetooth/dump/sepolicy/file_contexts
@@ -1,2 +0,0 @@
-# bt common hal dump_bt service
-/vendor/bin/dump/dump_bt           u:object_r:dump_bt_exec:s0
--- a/bluetooth/manifest_bluetooth.xml
+++ b/bluetooth/manifest_bluetooth.xml
@@ -1,27 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="aidl">
-        <name>android.hardware.bluetooth</name>
-        <version>1</version>
-        <fqname>IBluetoothHci/default</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>android.hardware.bluetooth.finder</name>
-        <version>1</version>
-        <fqname>IBluetoothFinder/default</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>android.hardware.bluetooth.ranging</name>
-        <version>1</version>
-        <fqname>IBluetoothChannelSounding/default</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>vendor.google.bluetooth_ext</name>
-        <version>1</version>
-        <fqname>IBTChannelAvoidance/default</fqname>
-        <fqname>IBluetoothCcc/default</fqname>
-        <fqname>IBluetoothEwp/default</fqname>
-        <fqname>IBluetoothExt/default</fqname>
-        <fqname>IBluetoothFinder/default</fqname>
-        <fqname>IBluetoothSar/default</fqname>
-    </hal>
-</manifest>
--- a/bluetooth/sepolicy/device.te
+++ b/bluetooth/sepolicy/device.te
@@ -1,3 +0,0 @@
-# Bt Wifi Coexistence device
-type wb_coexistence_dev, dev_type;
-
--- a/bluetooth/sepolicy/file_contexts
+++ b/bluetooth/sepolicy/file_contexts
@@ -1,6 +0,0 @@
-# Bluetooth
-/vendor/bin/hw/android\.hardware\.bluetooth-service\.pixel    u:object_r:hal_bluetooth_btlinux_exec:s0
-
-/dev/wbrc                           u:object_r:wb_coexistence_dev:s0
-/dev/ttySAC16                       u:object_r:hci_attach_dev:s0
-
--- a/bluetooth/sepolicy/genfs_contexts
+++ b/bluetooth/sepolicy/genfs_contexts
@@ -1,8 +0,0 @@
-# Bluetooth pin control device node
-genfscon sysfs /devices/platform/odm/odm:btbcm/rfkill/rfkill0/state                             u:object_r:sysfs_bluetooth_writable:s0
-genfscon sysfs /devices/platform/odm/odm:btbcm/rfkill/rfkill2/state                             u:object_r:sysfs_bluetooth_writable:s0
-genfscon proc /bluetooth/sleep/lpm                                                              u:object_r:proc_bluetooth_writable:s0
-genfscon proc /bluetooth/sleep/btwrite                                                          u:object_r:proc_bluetooth_writable:s0
-genfscon proc /bluetooth/sleep/btwake                                                           u:object_r:proc_bluetooth_writable:s0
-genfscon proc /bluetooth/timesync                                                               u:object_r:proc_bluetooth_writable:s0
-
--- a/bluetooth/sepolicy/hal_bluetooth_btlinux.te
+++ b/bluetooth/sepolicy/hal_bluetooth_btlinux.te
@@ -1,19 +0,0 @@
-# coexistence device file node
-add_hwservice(hal_bluetooth_btlinux, hal_bluetooth_coexistence_hwservice);
-add_service(hal_bluetooth_btlinux, hal_bluetooth_coexistence_service);
-allow hal_bluetooth_btlinux wb_coexistence_dev:chr_file rw_file_perms;
-
-# power stats
-allow hal_bluetooth_btlinux hal_power_stats_vendor_service:service_manager find;
-binder_call(hal_bluetooth_btlinux, hal_power_stats_default)
-
-# bt firmware dump
-allow hal_bluetooth_btlinux aconfig_storage_metadata_file:dir search;
-allow hal_bluetooth_btlinux sscoredump_vendor_data_crashinfo_file:dir rw_dir_perms;
-allow hal_bluetooth_btlinux sscoredump_vendor_data_crashinfo_file:file rw_file_perms;
-
-userdebug_or_eng(`
-  allow hal_bluetooth_btlinux sscoredump_vendor_data_coredump_file:dir create_dir_perms;
-  allow hal_bluetooth_btlinux sscoredump_vendor_data_coredump_file:file create_file_perms;
-  allow hal_bluetooth_btlinux logbuffer_device:chr_file r_file_perms;
-')
--- a/bluetooth/sepolicy/hwservice.te
+++ b/bluetooth/sepolicy/hwservice.te
@@ -1,3 +0,0 @@
-# Bluetooth HAL extension
-type hal_bluetooth_coexistence_hwservice, hwservice_manager_type, vendor_hwservice_type;
-
--- a/bluetooth/sepolicy/hwservice_contexts
+++ b/bluetooth/sepolicy/hwservice_contexts
@@ -1,6 +0,0 @@
-# Bluetooth HAL extension
-hardware.google.bluetooth.bt_channel_avoidance::IBTChannelAvoidance   u:object_r:hal_bluetooth_coexistence_hwservice:s0
-hardware.google.bluetooth.sar::IBluetoothSar                          u:object_r:hal_bluetooth_coexistence_hwservice:s0
-hardware.google.bluetooth.ccc::IBluetoothCcc                          u:object_r:hal_bluetooth_coexistence_hwservice:s0
-hardware.google.bluetooth.ewp::IBluetoothEwp                          u:object_r:hal_bluetooth_coexistence_hwservice:s0
-hardware.google.bluetooth.ext::IBluetoothExt                          u:object_r:hal_bluetooth_coexistence_hwservice:s0
--- a/bluetooth/sepolicy/service.te
+++ b/bluetooth/sepolicy/service.te
@@ -1,2 +0,0 @@
-# Bluetooth HAL extension
-type hal_bluetooth_coexistence_service, hal_service_type, service_manager_type;
--- a/bluetooth/sepolicy/service_contexts
+++ b/bluetooth/sepolicy/service_contexts
@@ -1,7 +0,0 @@
-# Bluetooth HAL extension
-vendor.google.bluetooth_ext.IBTChannelAvoidance/default                      u:object_r:hal_bluetooth_coexistence_service:s0
-vendor.google.bluetooth_ext.IBluetoothSar/default                            u:object_r:hal_bluetooth_coexistence_service:s0
-vendor.google.bluetooth_ext.IBluetoothCcc/default                            u:object_r:hal_bluetooth_coexistence_service:s0
-vendor.google.bluetooth_ext.IBluetoothEwp/default                            u:object_r:hal_bluetooth_coexistence_service:s0
-vendor.google.bluetooth_ext.IBluetoothExt/default                            u:object_r:hal_bluetooth_coexistence_service:s0
-vendor.google.bluetooth_ext.IBluetoothFinder/default                         u:object_r:hal_bluetooth_coexistence_service:s0
--- a/bootctrl/1.2/BootControl.cpp
+++ b/bootctrl/1.2/BootControl.cpp
@@ -19,7 +19,6 @@
 #include "BootControl.h"

 #include <android-base/file.h>
-#include <android-base/properties.h>
 #include <android-base/unique_fd.h>
 #include <bootloader_message/bootloader_message.h>
 #include <cutils/properties.h>
@@ -255,15 +254,16 @@ static bool blowAR_gs101() {
 }

 static bool blowAR() {
-    const auto& platform = ::android::base::GetProperty("ro.boot.hardware.platform", "");
+    char platform[PROPERTY_VALUE_MAX];
+    property_get("ro.boot.hardware.platform", platform, "");

-    if (platform == "gs101") {
+    if (std::string(platform) == "gs101") {
        return blowAR_gs101();
-    } else if (platform == "gs201" || platform == "zuma" || platform == "zumapro") {
+    } else if (std::string(platform) == "gs201" || std::string(platform) == "zuma") {
        return blowAR_zuma();
    }

-    return false;
+    return true;
 }

 }  // namespace
--- a/bootctrl/aidl/BootControl.cpp
+++ b/bootctrl/aidl/BootControl.cpp
@@ -20,7 +20,6 @@

 #include <android-base/file.h>
 #include <android-base/logging.h>
-#include <android-base/properties.h>
 #include <android-base/unique_fd.h>
 #include <bootloader_message/bootloader_message.h>
 #include <cutils/properties.h>
@@ -252,15 +251,16 @@ static bool blowAR_gs101() {
 }

 static bool blowAR() {
-    const auto& platform = ::android::base::GetProperty("ro.boot.hardware.platform", "");
+    char platform[PROPERTY_VALUE_MAX];
+    property_get("ro.boot.hardware.platform", platform, "");

-    if (platform == "gs101") {
+    if (std::string(platform) == "gs101") {
        return blowAR_gs101();
-    } else if (platform == "gs201" || platform == "zuma" || platform == "zumapro") {
+    } else if (std::string(platform) == "gs201" || std::string(platform) == "zuma") {
        return blowAR_zuma();
    }

-    return false;
+    return true;
 }

 static constexpr MergeStatus ToAIDLMergeStatus(HIDLMergeStatus status) {
@@ -384,7 +384,7 @@ ScopedAStatus BootControl::isSlotMarkedSuccessful(int32_t in_slot, bool* _aidl_r
        *_aidl_return = true;
        return ScopedAStatus::ok();
    }
-    if (in_slot < 0 || in_slot >= slots)
+    if (in_slot >= slots)
        return ScopedAStatus::fromServiceSpecificErrorWithMessage(
                INVALID_SLOT, (std::string("Invalid slot ") + std::to_string(in_slot)).c_str());

--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -12,8 +12,8 @@ cc_binary {
    ],
    shared_libs: [
        "libbase",
-        "libdump",
-        "liblog",
+	"libdump",
+	"liblog",
    ],
    vendor: true,
    relative_install_path: "dump",
@@ -26,35 +26,3 @@ prebuilt_etc {
    src: "vendor.android.hardware.camera.preview-dis.xml",
    sub_dir: "permissions",
 }
-
-prebuilt_etc {
-    name: "concurrent_foldable_dual_front_xml",
-    vendor: true,
-    filename: "com.google.pixel.camera.concurrent_foldable_dual_front.xml",
-    src: "com.google.pixel.camera.concurrent_foldable_dual_front.xml",
-    sub_dir: "permissions",
-}
-
-prebuilt_etc {
-    name: "libg3a_standalone_gabc_rc",
-    vendor: true,
-    proprietary: true,
-    init_rc: ["libg3a_gabc.rc"],
-    src: "libg3a_gabc.rc",
-}
-
-prebuilt_etc {
-    name: "libg3a_standalone_gaf_rc",
-    vendor: true,
-    proprietary: true,
-    init_rc: ["libg3a_gaf.rc"],
-    src: "libg3a_gaf.rc",
-}
-
-prebuilt_etc {
-    name: "libg3a_standalone_ghawb_rc",
-    vendor: true,
-    proprietary: true,
-    init_rc: ["libg3a_ghawb.rc"],
-    src: "libg3a_ghawb.rc",
-}
--- a/camera/com.google.pixel.camera.concurrent_foldable_dual_front.xml
+++ b/camera/com.google.pixel.camera.concurrent_foldable_dual_front.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- The feature on Pixel devices which supports concurrent foldable
-     dual front streaming -->
-<permissions>
-    <feature name="com.google.pixel.camera.concurrent_foldable_dual_front" />
-</permissions>
--- a/camera/dump.mk
+++ b/camera/dump.mk
@@ -2,5 +2,6 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/vendor
 PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/product/public
 PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/product/private

-PRODUCT_PACKAGES_ENG += dump_camera
-
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += dump_camera
+endif
--- a/camera/dump_camera.cpp
+++ b/camera/dump_camera.cpp
@@ -42,15 +42,12 @@ int main() {
  // Attach multiple latest sessions (in case the user is running concurrent
  // sessions or starts a new session after the one with performance issues).
  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 10, "session-ended-");
-  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 10, "multicam-");
  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 5, "high-drop-rate-");
  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 5, "watchdog-");
  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 5, "camera-ended-");
  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 5, "fatal-error-");
  dumpLogs(kGraphStateDumpDir.data(), cameraDestDir.c_str(), 5,
           "hal_graph_state_");
-  dumpLogs(kCameraLogDir.data(), cameraDestDir.c_str(), 10,
-           "fd_state_tracker-");

  return 0;
 }
--- a/camera/libg3a_gabc.rc
+++ b/camera/libg3a_gabc.rc
@@ -1,28 +0,0 @@
-# override default log levels.
-on boot
-    setprop log.tag.GABC E
-
-# backward-compatible system props.
-on property:persist.vendor.camera.gabc.debug_level=0
-    setprop log.tag.GABC S
-
-on property:persist.vendor.camera.gabc.debug_level=1
-    setprop log.tag.GABC V
-
-on property:persist.vendor.camera.gabc.debug_level=2
-    setprop log.tag.GABC V
-
-on property:persist.vendor.camera.gabc.debug_level=3
-    setprop log.tag.GABC D
-
-on property:persist.vendor.camera.gabc.debug_level=4
-    setprop log.tag.GABC I
-
-on property:persist.vendor.camera.gabc.debug_level=5
-    setprop log.tag.GABC W
-
-on property:persist.vendor.camera.gabc.debug_level=6
-    setprop log.tag.GABC E
-
-on property:persist.vendor.camera.gabc.debug_level=7
-    setprop log.tag.GABC A
--- a/camera/libg3a_gaf.rc
+++ b/camera/libg3a_gaf.rc
@@ -1,83 +0,0 @@
-# override default log levels.
-on boot
-    setprop log.tag.GAF E
-
-# backward-compatible system props.
-on property:persist.vendor.camera.af.debug_level=0
-    setprop log.tag.GAF S
-
-on property:persist.vendor.camera.af.debug_level=1
-    setprop log.tag.GAF V
-
-on property:persist.vendor.camera.af.debug_level=2
-    setprop log.tag.GAF V
-
-on property:persist.vendor.camera.af.debug_level=3
-    setprop log.tag.GAF D
-
-on property:persist.vendor.camera.af.debug_level=4
-    setprop log.tag.GAF I
-
-on property:persist.vendor.camera.af.debug_level=5
-    setprop log.tag.GAF W
-
-on property:persist.vendor.camera.af.debug_level=6
-    setprop log.tag.GAF E
-
-on property:persist.vendor.camera.af.debug_level=7
-    setprop log.tag.GAF A
-
-on property:persist.vendor.camera.af.video_debug_enable=2
-    setprop vendor.camera.3a.log_level 1
-    setprop log.tag.3a.gcrd.af.parser.input V
-    setprop log.tag.3a.gcrd.af.parser.output V
-    setprop log.tag.3a.gcrd.af.processor V
-    setprop log.tag.3a.gcrd.af.engine V
-    setprop log.tag.3a.gcrd.dtm V
-
-on property:persist.vendor.camera.af.video_debug_enable=0
-    setprop vendor.camera.3a.log_level 6
-    setprop log.tag.3a.gcrd.af.parser.input E
-    setprop log.tag.3a.gcrd.af.parser.output E
-    setprop log.tag.3a.gcrd.af.processor E
-    setprop log.tag.3a.gcrd.af.engine E
-    setprop log.tag.3a.gcrd.dtm E
-
-on property:persist.vendor.camera.af.default_focus_only=false
-    setprop persist.vendor.camera.af.ignore_ctrl_focus_region false
-    setprop persist.vendor.camera.af.ignore_face 0
-    setprop persist.vendor.camera.af.force_saliency_consumption ""
-
-on property:persist.vendor.camera.af.default_focus_only=true
-    setprop persist.vendor.camera.af.ignore_ctrl_focus_region true
-    setprop persist.vendor.camera.af.ignore_face 1
-    setprop persist.vendor.camera.af.force_saliency_consumption false
-
-# Reset every related properties
-on property:persist.vendor.camera.af.standalone_searchlet=reset
-    setprop persist.vendor.camera.af.ignore_pd \"\"
-    setprop persist.vendor.camera.af.ignore_tof \"\"
-    setprop persist.vendor.camera.af.ignore_cdaf \"\"
-    setprop persist.vendor.camera.af.ignore_gyro \"\"
-    setprop persist.vendor.camera.af.ignore_3a \"\"
-    setprop vendor.camera.debug.enable_saliency \"\"
-
-# Standalone framework: PDAF
-on property:persist.vendor.camera.af.standalone_searchlet=pdaf
-    setprop persist.vendor.camera.af.ignore_tof 1
-    setprop persist.vendor.camera.af.ignore_gyro 1
-    setprop persist.vendor.camera.af.ignore_3a 1
-    setprop vendor.camera.debug.enable_saliency 0
-
-# Standalone framework: LDAF
-on property:persist.vendor.camera.af.standalone_searchlet=ldaf
-    setprop persist.vendor.camera.af.ignore_pd 7
-    setprop persist.vendor.camera.af.ignore_gyro 1
-    setprop persist.vendor.camera.af.ignore_3a 1
-    setprop vendor.camera.debug.enable_saliency 0
-
-# Standalone framework: CDAF
-on property:persist.vendor.camera.af.standalone_searchlet=cdaf
-    setprop persist.vendor.camera.af.ignore_pd 7
-    setprop persist.vendor.camera.af.ignore_tof 1
-    setprop vendor.camera.debug.enable_saliency 0
--- a/camera/libg3a_ghawb.rc
+++ b/camera/libg3a_ghawb.rc
@@ -1,28 +0,0 @@
-# override default log levels.
-on boot
-    setprop log.tag.GHAWB E
-
-# backward-compatible system props.
-on property:persist.vendor.camera.ghawb.debug_level=0
-    setprop log.tag.GHAWB S
-
-on property:persist.vendor.camera.ghawb.debug_level=1
-    setprop log.tag.GHAWB V
-
-on property:persist.vendor.camera.ghawb.debug_level=2
-    setprop log.tag.GHAWB V
-
-on property:persist.vendor.camera.ghawb.debug_level=3
-    setprop log.tag.GHAWB D
-
-on property:persist.vendor.camera.ghawb.debug_level=4
-    setprop log.tag.GHAWB I
-
-on property:persist.vendor.camera.ghawb.debug_level=5
-    setprop log.tag.GHAWB W
-
-on property:persist.vendor.camera.ghawb.debug_level=6
-    setprop log.tag.GHAWB E
-
-on property:persist.vendor.camera.ghawb.debug_level=7
-    setprop log.tag.GHAWB A
--- a/camera/lyric.mk
+++ b/camera/lyric.mk
@@ -5,35 +5,20 @@ $(call soong_config_set,lyric,use_lyric_camera_hal,true)
 $(call soong_config_set,google3a_config,gcam_awb,true)
 $(call soong_config_set,google3a_config,ghawb_truetone,true)

-# Flag controls whether Lyric apex can be located in the dist-directory.
-$(call soong_config_set, lyric, dist_lyric_apex, $(RELEASE_PIXEL_DIST_LYRIC_APEX))
-
 # Select GCH backend.
 # TODO(b/192681010): This dependency inversion should be removed.
 ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
 $(call soong_config_set,gch,hwl_library,lyric)
 endif

-# Use build-time flag to select whether to build from source
-# or ingest prebuilt-apex.  We would want the development teams
-# using release configuration: (trunk-staging) to build from source.
-# All shipping releases will switch to prebuilts (trunk+)
-# if this condition is not true, then build from source.
-
-# Fallback if the prebuilts directory does not exist, then we must
-# build from source no matter what, so we log a warning
-ifeq ($(RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT),true)
-  ifeq ($(wildcard vendor/google/services/LyricCameraHAL/prebuilt),)
-    $(warning Lyric prebuilt directory is missing, it will be built from source)
-    BUILD_LYRIC_FROM_SOURCE := true
-  else
-    BUILD_LYRIC_FROM_SOURCE := false
-  endif
+# Check if we're in PDK build
+ifeq ($(wildcard vendor/google/camera),)
+# If vendor/google/camera doesn't exist, it's a PDK build.
+$(call soong_config_set,lyric,pdk_build,true)
 else
-  BUILD_LYRIC_FROM_SOURCE := true
-endif  # RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT
+# Otherwise, it's an internal Google build.
+$(call soong_config_set,lyric,pdk_build,false)

-ifeq ($(BUILD_LYRIC_FROM_SOURCE),true)
 PRODUCT_SOONG_NAMESPACES += \
    vendor/google/camera \
    vendor/google/camera/google_3a/libs_v4 \
@@ -49,7 +34,12 @@ PRODUCT_SOONG_NAMESPACES += \
    vendor/google/camera/google_3a/libs_v4/gAF \
    vendor/google/camera/google_3a/libs_v4/gafd \
    vendor/google/camera/google_3a/libs_v4/gHAWB/native_coverage
-endif  # BUILD_LYRIC_FROM_SOURCE
+
+# Calibration tool for debug builds
+PRODUCT_PACKAGES_DEBUG += tarasque_test
+PRODUCT_PACKAGES_DEBUG += ProtoCalibGenerator
+
+endif  # vendor/google/camera check

 # Init-time log settings for Google 3A
 PRODUCT_PACKAGES += libg3a_standalone_gabc_rc
@@ -69,7 +59,3 @@ DEVICE_MATRIX_FILE += \

 # sepolicy dir is added in dump.mk.
 # Make doesn't deduplicate sepolicy dirs, so including it here causes build errors.
-
-# Calibration tools for debug builds
-PRODUCT_PACKAGES_DEBUG += tarasque_test
-PRODUCT_PACKAGES_DEBUG += ProtoCalibGenerator
--- a/camera/lyric_soong_variables.md
+++ b/camera/lyric_soong_variables.md
@@ -44,13 +44,3 @@ Example:
 $(call soong_config_set,google3a_config,target_device,oriole)
 ```
 A mixture of `camera_hardware` and `tuning_product` used by 3A.
-
-## `radioext_interface_type`
-
-Example:
-```
-$(call soong_config_set,lyric,radioext_interface_type,aidl)
-```
-Specifies which interface type to use in the RadioExt client when communicating
-with the RadioExt service. The possible values are "hidl" and "aidl".
-Devices launching with Android 15 no longer support HIDL.
--- a/camera/sepolicy/product/private/service_contexts
+++ b/camera/sepolicy/product/private/service_contexts
@@ -1,5 +1 @@
-com.google.pixel.camera.services.binder.IServiceBinder/default u:object_r:camera_binder_service:s0
-
-com.google.pixel.camera.services.cameraidremapper.ICameraIdRemapper/default u:object_r:camera_cameraidremapper_service:s0
-
-com.google.pixel.camera.services.lyricconfigprovider.ILyricConfigProvider/default u:object_r:camera_lyricconfigprovider_service:s0
+com.google.pixel.camera.services.binder.IServiceBinder/default u:object_r:camera_binder_service:s0
--- a/camera/sepolicy/product/private/vendor_pbcs_app.te
+++ b/camera/sepolicy/product/private/vendor_pbcs_app.te
@@ -9,10 +9,4 @@ allow vendor_pbcs_app app_api_service:service_manager find;
 allow vendor_pbcs_app cameraserver_service:service_manager find;

 # Allow PBCS to add the ServiceBinder service to ServiceManager.
-add_service(vendor_pbcs_app, camera_binder_service);
-
-# Allow PBCS to add the CameraIdRemapper service to ServiceManager.
-add_service(vendor_pbcs_app, camera_cameraidremapper_service);
-
-# Allow PBCS to add the LyricConfigProvider service to ServiceManager.
-add_service(vendor_pbcs_app, camera_lyricconfigprovider_service);
+add_service(vendor_pbcs_app, camera_binder_service);
--- a/camera/sepolicy/product/private/vendor_pcs_app.te
+++ b/camera/sepolicy/product/private/vendor_pcs_app.te
@@ -8,8 +8,6 @@ allow vendor_pcs_app {
    app_api_service
    audioserver_service
    cameraserver_service
-    camera_cameraidremapper_service
-    camera_lyricconfigprovider_service
    drmserver_service
    mediametrics_service
    mediaserver_service
--- a/camera/sepolicy/product/public/service.te
+++ b/camera/sepolicy/product/public/service.te
@@ -1,5 +1 @@
-type camera_binder_service, hal_service_type, protected_service, service_manager_type;
-
-type camera_cameraidremapper_service, hal_service_type, protected_service, service_manager_type;
-
-type camera_lyricconfigprovider_service, hal_service_type, protected_service, service_manager_type;
+type camera_binder_service, hal_service_type, protected_service, service_manager_type;
--- a/camera/sepolicy/vendor/hal_camera_default.te
+++ b/camera/sepolicy/vendor/hal_camera_default.te
@@ -1,6 +1,6 @@
 allow hal_camera_default camera_binder_service:service_manager find;
 # Allow Lyric Hal to find the LyricConfigProvider service through ServiceManager.
-allow hal_camera_default camera_lyricconfigprovider_service:service_manager find;
+allow hal_camera_default vendor_camera_lyricconfigprovider_service:service_manager find;

 allow hal_camera_default hal_pixel_remote_camera_service:service_manager find;

@@ -8,5 +8,5 @@ binder_call(hal_camera_default, vendor_pbcs_app);

 binder_call(hal_camera_default, vendor_pcs_app);

-# Allow Lyric HAL to start Image Processing HAL
-add_service(hal_camera_default, vendor_image_processing_hal_service)
+# Allow Lyric HAL to start ISP Service
+add_service(hal_camera_default, vendor_camera_isp_service)
--- a/camera/sepolicy/vendor/service.te
+++ b/camera/sepolicy/vendor/service.te
@@ -1,3 +1,7 @@
 type hal_pixel_remote_camera_service, hal_service_type, protected_service, service_manager_type;

-type vendor_image_processing_hal_service, hal_service_type, protected_service, service_manager_type;
+type vendor_camera_lyricconfigprovider_service, hal_service_type, protected_service, service_manager_type;
+
+type vendor_camera_isp_service, hal_service_type, protected_service, service_manager_type;
+
+type vendor_camera_cameraidremapper_service, hal_service_type, protected_service, service_manager_type;
--- a/camera/sepolicy/vendor/service_contexts
+++ b/camera/sepolicy/vendor/service_contexts
@@ -1,3 +1,7 @@
 com.google.pixel.camera.connectivity.hal.provider.ICameraProvider/default u:object_r:hal_pixel_remote_camera_service:s0

-com.google.android.imageprocessing.hal.IImageProcessingHal/default u:object_r:vendor_image_processing_hal_service:s0
+com.google.pixel.camera.services.lyricconfigprovider.ILyricConfigProvider/default u:object_r:vendor_camera_lyricconfigprovider_service:s0
+
+com.google.pixel.camera.isp.IIspService/default u:object_r:vendor_camera_isp_service:s0
+
+com.google.pixel.camera.services.cameraidremapper.ICameraIdRemapper/default u:object_r:vendor_camera_cameraidremapper_service:s0
--- a/camera/sepolicy/vendor/vendor_pbcs_app.te
+++ b/camera/sepolicy/vendor/vendor_pbcs_app.te
@@ -1,9 +1,9 @@
 # Allow PBCS to add the ServiceBinder service to ServiceManager.
 add_service(vendor_pbcs_app, camera_binder_service);
 # Allow PBCS to add the LyricConfigProvider service to ServiceManager.
-add_service(vendor_pbcs_app, camera_lyricconfigprovider_service);
+add_service(vendor_pbcs_app, vendor_camera_lyricconfigprovider_service);
 # Allow PBCS to add the CameraIdRemapper service to ServiceManager.
-add_service(vendor_pbcs_app, camera_cameraidremapper_service);
+add_service(vendor_pbcs_app, vendor_camera_cameraidremapper_service);

 # Allow PBCS to read debug system properties of the form vendor.camera.pbcs.debug.*
 # and persist.vendor.camera.pbcs.debug.*
--- a/camera/sepolicy/vendor/vendor_pcs_app.te
+++ b/camera/sepolicy/vendor/vendor_pcs_app.te
@@ -1,6 +1,6 @@
 allow vendor_pcs_app {
-    camera_lyricconfigprovider_service
-    camera_cameraidremapper_service
+    vendor_camera_lyricconfigprovider_service
+    vendor_camera_cameraidremapper_service
    edgetpu_app_service
 }:service_manager find;

--- a/check_current_prebuilt/check_current_prebuilt.mk
+++ b/check_current_prebuilt/check_current_prebuilt.mk
@@ -1,27 +0,0 @@
-# Create symlink for bootloader
-$(shell rm -f "pixel_current_bootloader")
-ifdef BOOTLOADER_FILE_PATH
-$(shell ln -sf ${BOOTLOADER_FILE_PATH} "pixel_current_bootloader")
-else ifdef BOOTLOADER_RADIO_FILE_PATH
-$(shell ln -sf ${BOOTLOADER_RADIO_FILE_PATH} "pixel_current_bootloader")
-endif
-
-# Create symlink for kernel
-$(shell rm -f "pixel_current_kernel")
-ifdef TARGET_KERNEL_DIR
-$(shell ln -sf ${TARGET_KERNEL_DIR} "pixel_current_kernel")
-endif
-
-# Create symlink for radio
-$(shell rm -f "pixel_current_radio")
-ifdef RADIO_FILE_PATH
-$(shell ln -sf ${RADIO_FILE_PATH} "pixel_current_radio")
-else ifdef BOOTLOADER_RADIO_FILE_PATH
-$(shell ln -sf ${BOOTLOADER_RADIO_FILE_PATH} "pixel_current_radio")
-endif
-
-# Create symlink for radiocfg
-$(shell rm -f "pixel_current_radiocfg")
-ifdef SRC_MDM_CFG_DIR
-$(shell ln -sf ${SRC_MDM_CFG_DIR} "pixel_current_radiocfg")
-endif
--- a/chre/sepolicy/hal_contexthub_default.te
+++ b/chre/sepolicy/hal_contexthub_default.te
@@ -35,6 +35,3 @@ allow hal_contexthub_default self:global_capability2_class_set block_suspend;

 # Allow binder calls with clients
 binder_call(hal_contexthub_default, hal_sensors_default)
-
-# Allow access for AoC properties.
-get_prop(hal_contexthub_default, vendor_aoc_prop)
--- a/dauntless/gsc.mk
+++ b/dauntless/gsc.mk
@@ -1,6 +1,6 @@
 # Dauntless
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/dauntless/sepolicy
-ifneq ($(wildcard vendor/google_nos),)
+ifneq ($(wildcard vendor),)
 PRODUCT_SOONG_NAMESPACES += vendor/google_nos/init/dauntless

 PRODUCT_PACKAGES += \
@@ -9,87 +9,18 @@ PRODUCT_PACKAGES += \
    android.hardware.weaver-service.citadel \
    android.hardware.authsecret-service.citadel \
    android.hardware.oemlock-service.citadel \
+    android.hardware.identity@1.0-service.citadel \
    init_citadel \
    android.hardware.strongbox_keystore.xml \
    android.hardware.security.keymint-service.citadel \
    dump_gsc.sh

 # USERDEBUG ONLY: Install test packages
-PRODUCT_PACKAGES_ENG += citadel_integration_tests \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += citadel_integration_tests \
                          pwntest \
                          nugget_targeted_tests \
                          CitadelProvision \
                          nugget_aidl_test_weaver
-
-# Assign default value for RELEASE_GOOGLE_DAUNTLESS_DIR if no trunk flags support
-RELEASE_GOOGLE_DAUNTLESS_DIR ?= vendor/google_nos/prebuilts/dauntless
-
-# The production Dauntless firmware will be of flavors evt and d3m2.
-# There are also several flavors of pre-release chips. Each flavor
-# (production and pre-release) requires the firmware to be signed differently.
-DAUNTLESS_FIRMWARE_SIZE := 1048576
-
-# The nearly-production Dauntless chips are "proto1.1"
-ifneq (,$(wildcard $(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin))
-ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" $(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin))
-$(error GSC firmware size check fail)
 endif
-PRODUCT_COPY_FILES += \
-    $(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dauntless/proto11.ec.bin
-$(call dist-for-goals,droid,$(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin)
-else
-$(error GSC firmware not found in $(RELEASE_GOOGLE_DAUNTLESS_DIR))
 endif
-
-# The production Dauntless chips are "evt"
-ifneq (,$(wildcard $(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin))
-ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" $(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin))
-$(error GSC firmware size check fail)
-endif
-PRODUCT_COPY_FILES += \
-    $(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dauntless/evt.ec.bin
-$(call dist-for-goals,droid,$(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin)
-else
-$(error GSC firmware not found in $(RELEASE_GOOGLE_DAUNTLESS_DIR))
-endif
-
-# New 2023 production Dauntless chips are "d3m2"
-ifneq (,$(wildcard $(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin))
-ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" $(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin))
-$(error GSC firmware size check fail)
-endif
-PRODUCT_COPY_FILES += \
-    $(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dauntless/d3m2.ec.bin
-$(call dist-for-goals,droid,$(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin)
-else
-$(error GSC firmware not found in $(RELEASE_GOOGLE_DAUNTLESS_DIR))
-endif
-
-# Intermediate image artifacts are published, but aren't included in /vendor/firmware/dauntless
-# in PRODUCT_COPY_FILES
-# This is because intermediate images aren't needed on user devices, but the published artifact
-# is useful for flashstation purposes.
-
-# proto11 chips need an intermediate image prior to upgrading to newever versions of the firmware
-ifneq (,$(wildcard vendor/google_nos/prebuilts/dauntless/intermediate_images/proto11_intermediate.ec.bin))
-ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" vendor/google_nos/prebuilts/dauntless/intermediate_images/proto11_intermediate.ec.bin))
-$(error GSC firmware size check fail)
-endif
-$(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/proto11_intermediate.ec.bin)
-endif
-# evt chips need an intermediate image prior to upgrading to newever versions of the firmware
-ifneq (,$(wildcard vendor/google_nos/prebuilts/dauntless/intermediate_images/evt_intermediate.ec.bin))
-ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" vendor/google_nos/prebuilts/dauntless/intermediate_images/evt_intermediate.ec.bin))
-$(error GSC firmware size check fail)
-endif
-$(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/evt_intermediate.ec.bin)
-endif
-# d3m2 chips need an intermediate image prior to upgrading to newever versions of the firmware
-ifneq (,$(wildcard vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin))
-ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin))
-$(error GSC firmware size check fail)
-endif
-$(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin)
-endif
-
-endif # $(wildcard vendor/google_nos)
--- a/device.mk
+++ b/device.mk
@@ -30,6 +30,3 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)

 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.software.ipsec_tunnel_migration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnel_migration.xml
-
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += \
-	device/google/gs-common/vintf/framework_compatibility_matrix.xml
--- a/display/dump.mk
+++ b/display/dump.mk
@@ -1,4 +1,6 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy

-PRODUCT_PACKAGES_ENG += dump_display_userdebug.sh
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += dump_display_userdebug.sh
+endif
 PRODUCT_PACKAGES += dump_display
--- a/display/dump_display.cpp
+++ b/display/dump_display.cpp
@@ -16,15 +16,15 @@
 #include <dump/pixel_dump.h>
 #include <android-base/file.h>

+
 int main() {
    setbuf(stdout, NULL);
    dumpFileContent("DECON-0 counters /sys/class/drm/card0/device/decon0/counters", "/sys/class/drm/card0/device/decon0/counters");
    dumpFileContent("CRTC-0 event log", "/sys/kernel/debug/dri/0/crtc-0/event");
    runCommand("libdisplaycolor", "/vendor/bin/dumpsys displaycolor -v");
-
-    dumpFileContent("Primary panel name", "/sys/class/drm/card0/device/primary-panel/panel_name");
-    dumpFileContent("Primary panel extra info", "/sys/class/drm/card0/device/primary-panel/panel_extinfo");
-    dumpFileContent("Primary panel power Vreg", "/sys/class/drm/card0/device/primary-panel/panel_pwr_vreg");
-    dumpFileContent("Primary panel power mode register", "/sys/class/drm/card0/device/primary-panel/power_mode");
+    dumpFileContent("Primary panel name", "/sys/devices/platform/exynos-drm/primary-panel/panel_name");
+    dumpFileContent("Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo");
+    dumpFileContent("Primary panel power Vreg", "/sys/devices/platform/exynos-drm/primary-panel/panel_pwr_vreg");
    return 0;
 }
+
--- a/display/dump_display_userdebug.sh
+++ b/display/dump_display_userdebug.sh
@@ -1,8 +1,4 @@
 #!/vendor/bin/sh
-display_trace_path="/sys/kernel/tracing/instances/pixel-display/trace"
-echo "------ Display Trace ($display_trace_path)------"
-cat $display_trace_path
-
 echo "------ HWC Fence States ------"
 for f in $(ls /data/vendor/log/hwc/*_hwc_fence_state*.txt)
 do
--- a/display/dump_second_display.cpp
+++ b/display/dump_second_display.cpp
@@ -18,9 +18,8 @@
 int main() {
    dumpFileContent("DECON-1 counters /sys/class/drm/card0/device/decon1/counters", "/sys/class/drm/card0/device/decon1/counters");
    dumpFileContent("CRTC-1 event log", "/sys/kernel/debug/dri/0/crtc-1/event");
-
-    dumpFileContent("Secondary panel name", "/sys/class/drm/card0/device/secondary-panel/panel_name");
-    dumpFileContent("Secondary panel extra info", "/sys/class/drm/card0/device/secondary-panel/panel_extinfo");
-    dumpFileContent("Secondary panel power mode register", "/sys/class/drm/card0/device/secondary-panel/power_mode");
+    dumpFileContent("Secondary panel name", "/sys/devices/platform/exynos-drm/secondary-panel/panel_name");
+    dumpFileContent("Secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo");
    return 0;
 }
+
--- a/display/sepolicy/dump_display.te
+++ b/display/sepolicy/dump_display.te
@@ -1,4 +1,3 @@
-# Display (dump for bugreport)
 pixel_bugreport(dump_display)

 allow dump_display sysfs_display:file r_file_perms;
--- a/display/sepolicy/dump_display_userdebug.te
+++ b/display/sepolicy/dump_display_userdebug.te
@@ -1,4 +1,3 @@
-# Display eng/userdebug (dump for bugreport)
 pixel_bugreport(dump_display_userdebug)

 userdebug_or_eng(`
@@ -6,6 +5,4 @@ userdebug_or_eng(`
  allow dump_display_userdebug vendor_log_file:dir search;
  allow dump_display_userdebug vendor_hwc_log_file:dir r_dir_perms;
  allow dump_display_userdebug vendor_hwc_log_file:file r_file_perms;
-  allow dump_display_userdebug debugfs_tracing_instances:dir search;
-  allow dump_display_userdebug debugfs_tracing_instances:file r_file_perms;
 ')
--- a/dump_chip_info/Android.bp
+++ b/dump_chip_info/Android.bp
@@ -1,20 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_binary {
-    name: "dump_chip_info",
-    srcs: ["dump_chip_info.cpp"],
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
-    ],
-    shared_libs: [
-        "libbase",
-        "libdump",
-        "liblog",
-    ],
-    vendor: true,
-    relative_install_path: "dump",
-}
--- a/dump_chip_info/chip_info.mk
+++ b/dump_chip_info/chip_info.mk
@@ -1,3 +0,0 @@
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/dump_chip_info/sepolicy
-
-PRODUCT_PACKAGES += dump_chip_info
--- a/dump_chip_info/dump_chip_info.cpp
+++ b/dump_chip_info/dump_chip_info.cpp
@@ -1,28 +0,0 @@
-/*
- * Copyright 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <dump/pixel_dump.h>
-#include <android-base/file.h>
-
-int main() {
-    dumpFileContent("ap_rom_patch_ver", "/sys/devices/system/goog-chip-info/ap_rom_patch_ver");
-    dumpFileContent("gpcm_asic_id", "/sys/devices/system/goog-chip-info/gpcm_asic_id");
-    dumpFileContent("device_table", "/sys/devices/system/goog-chip-info/device_table");
-    dumpFileContent("dvfs_table", "/sys/devices/system/goog-chip-info/dvfs_table");
-    dumpFileContent("hw_feature_table", "/sys/devices/system/goog-chip-info/hw_feature_table");
-    dumpFileContent("ids_table", "/sys/devices/system/goog-chip-info/ids_table");
-
-    return 0;
-}
--- a/dump_chip_info/sepolicy/dump_chip_info.te
+++ b/dump_chip_info/sepolicy/dump_chip_info.te
@@ -1,3 +0,0 @@
-#
-pixel_bugreport(dump_chip_info)
-allow dump_chip_info sysfs_chip_info:file r_file_perms;
--- a/dump_chip_info/sepolicy/file.te
+++ b/dump_chip_info/sepolicy/file.te
@@ -1,2 +0,0 @@
-#
-type sysfs_chip_info, sysfs_type, fs_type;
--- a/dump_chip_info/sepolicy/file_contexts
+++ b/dump_chip_info/sepolicy/file_contexts
@@ -1 +0,0 @@
-/vendor/bin/dump/dump_chip_info     u:object_r:dump_chip_info_exec:s0
--- a/dump_chip_info/sepolicy/genfs_contexts
+++ b/dump_chip_info/sepolicy/genfs_contexts
@@ -1,6 +0,0 @@
-genfscon sysfs /devices/system/goog-chip-info/ap_rom_patch_ver u:object_r:sysfs_chip_info:s0
-genfscon sysfs /devices/system/goog-chip-info/gpcm_asic_id     u:object_r:sysfs_chip_info:s0
-genfscon sysfs /devices/system/goog-chip-info/device_table     u:object_r:sysfs_chip_info:s0
-genfscon sysfs /devices/system/goog-chip-info/dvfs_table       u:object_r:sysfs_chip_info:s0
-genfscon sysfs /devices/system/goog-chip-info/hw_feature_table u:object_r:sysfs_chip_info:s0
-genfscon sysfs /devices/system/goog-chip-info/ids_table        u:object_r:sysfs_chip_info:s0
--- a/edgetpu/edgetpu.mk
+++ b/edgetpu/edgetpu.mk
@@ -19,6 +19,10 @@ PRODUCT_PACKAGES += \
 # TPU TFlite Delegate
 PRODUCT_PACKAGES += \
        libedgetpu_util
+# TPU DBA AIDL HAL service
+PRODUCT_PACKAGES += com.google.edgetpu.dba-service
+# TPU DBA C API library
+PRODUCT_PACKAGES += libedgetpu_dba.google
 # TPU Tachyon HAL service
 PRODUCT_PACKAGES += com.google.edgetpu.tachyon-service
 # TPU Tachyon C API library
--- a/edgetpu/sepolicy/device.te
+++ b/edgetpu/sepolicy/device.te
@@ -1,2 +1,2 @@
 # EdgeTPU device (DarwiNN)
-type edgetpu_device, dev_type, mlstrustedobject, isolated_compute_allowed_device;
+type edgetpu_device, dev_type, mlstrustedobject;
--- a/edgetpu/sepolicy/edgetpu_app_service.te
+++ b/edgetpu/sepolicy/edgetpu_app_service.te
@@ -38,12 +38,3 @@ binder_call(edgetpu_app_server, edgetpu_vendor_server);

 # Allow EdgeTPU service to log to stats service. (metrics)
 allow edgetpu_app_server fwk_stats_service:service_manager find;
-
-# Allow mlock without size restriction
-allow edgetpu_app_server self:capability ipc_lock;
-
-# Need to effectively read file mapped file when mmap + mlocked.
-allow edgetpu_app_server privapp_data_file:file { map read};
-
-# For shell level testing of mlock
-allow edgetpu_app_server shell_data_file:file { map read};
--- a/edgetpu/sepolicy/edgetpu_tachyon_service.te
+++ b/edgetpu/sepolicy/edgetpu_tachyon_service.te
@@ -27,9 +27,6 @@ allow edgetpu_tachyon_server gpu_device:chr_file rw_file_perms;
 allow edgetpu_tachyon_server gpu_device:dir r_dir_perms;
 allow edgetpu_tachyon_server ion_device:chr_file r_file_perms;

-# Allow Tachyon service to access camera hal via binder.
-binder_call(edgetpu_tachyon_server, hal_camera_default);
-
 # Allow Tachyon service to access dmabuf sysytem.
 allow edgetpu_tachyon_server dmabuf_system_heap_device:chr_file r_file_perms;

@@ -42,7 +39,7 @@ allow edgetpu_tachyon_server proc_version:file r_file_perms;

 # Allow Tachyon service to send trace packets to Perfetto with SELinux enabled
 # under userdebug builds.
-perfetto_producer(edgetpu_tachyon_server)
+userdebug_or_eng(`perfetto_producer(edgetpu_tachyon_server)')

 # Allow Tachyon service to read tflite DarwiNN delegate properties
 get_prop(edgetpu_tachyon_server, vendor_tflite_delegate_prop)
@@ -52,17 +49,3 @@ get_prop(edgetpu_tachyon_server, vendor_edgetpu_runtime_prop)
 get_prop(edgetpu_tachyon_server, vendor_hetero_runtime_prop)
 # Allow Tachyon service to read EdgeTPU CPU scheduler properties
 get_prop(edgetpu_tachyon_server, vendor_edgetpu_cpu_scheduler_prop)
-
-# Allow mlock without size restriction
-allow edgetpu_tachyon_server self:capability ipc_lock;
-
-# Need to effectively read file mapped file when mmap + mlocked.
-allow edgetpu_tachyon_server privapp_data_file:file { map read};
-
-# For shell level testing of mlock
-userdebug_or_eng(`
-    allow edgetpu_tachyon_server shell_data_file:file { map read};
-')
-
-# For shell level testing
-binder_call(edgetpu_tachyon_server, shell);
--- a/edgetpu/sepolicy/file_contexts
+++ b/edgetpu/sepolicy/file_contexts
@@ -15,10 +15,8 @@
 /vendor/lib64/libmetrics_logger\.so                                        u:object_r:same_process_hal_file:s0
 /vendor/lib64/libedgetpu_util\.so                                          u:object_r:same_process_hal_file:s0
 # EdgeTPU runtime libraries
-/vendor/lib64/com\.google\.edgetpu_app_service-V[1-4]-ndk\.so              u:object_r:same_process_hal_file:s0
+/vendor/lib64/com\.google\.edgetpu_app_service-V[1-3]-ndk\.so              u:object_r:same_process_hal_file:s0
 /vendor/lib64/com\.google\.edgetpu_vendor_service-V[1-2]-ndk\.so           u:object_r:same_process_hal_file:s0
-# EdgeTPU Tachyon libraries
-/vendor/lib64/libedgetpu_tachyon\.google\.so                               u:object_r:same_process_hal_file:s0

 # EdgeTPU data files
 /data/vendor/hal_neuralnetworks_darwinn(/.*)?                              u:object_r:hal_neuralnetworks_darwinn_data_file:s0
@@ -29,6 +27,3 @@

 # Tachyon service
 /vendor/bin/hw/com\.google\.edgetpu.tachyon-service                        u:object_r:edgetpu_tachyon_server_exec:s0
-
-# libfmq.so is dynamically loaded by the Tachyon client-side library libedgetpu_tachyon.google.so
-/vendor/lib64/libfmq\.so                                                   u:object_r:same_process_hal_file:s0
--- a/edgetpu/sepolicy/hal_audio_default.te
+++ b/edgetpu/sepolicy/hal_audio_default.te
@@ -12,19 +12,7 @@ binder_call(hal_audio_default, edgetpu_app_server)

 # Allow audio HAL to read tflite Darwinn delegate properties
 get_prop(hal_audio_default, vendor_tflite_delegate_prop)
-
-# Allow audio HAL to read DarwiNN runtime properties
 get_prop(hal_audio_default, vendor_edgetpu_runtime_prop)

-# Allow audio HAL to read hetero runtime properties
-get_prop(hal_audio_default, vendor_hetero_runtime_prop)
-
 # Allow DMA Buf access.
 allow hal_audio_default dmabuf_system_heap_device:chr_file r_file_perms;
-
-# Allow audio HAL to connect to the stats service for logging EdgeTpu metrics.
-allow hal_audio_default fwk_stats_service:service_manager find;
-
-# Allow audio HAL to send EdgeTpu trace packets to Perfetto.
-# Enable for prod devices, see: go/darwinn-perfetto-critical-events
-perfetto_producer(hal_audio_default)
--- a/edgetpu/sepolicy/hal_camera_default.te
+++ b/edgetpu/sepolicy/hal_camera_default.te
@@ -6,10 +6,3 @@ get_prop(hal_camera_default, vendor_edgetpu_runtime_prop)

 # Allow camera HAL to read hetero runtime properties
 get_prop(hal_camera_default, vendor_hetero_runtime_prop)
-
-# Allow camera HAL to access tachyon HAL
-allow hal_camera_default edgetpu_tachyon_service:service_manager find;
-
-# Allow camera HAL to communicate with tachyon hal using binder calls
-binder_call(hal_camera_default, edgetpu_tachyon_server);
-
--- a/edgetpu/sepolicy/hal_neuralnetworks_darwinn.te
+++ b/edgetpu/sepolicy/hal_neuralnetworks_darwinn.te
@@ -1,4 +1,3 @@
-# Sepolicies for EdgeTPU
 type hal_neuralnetworks_darwinn, domain;
 hal_server_domain(hal_neuralnetworks_darwinn, hal_neuralnetworks)

@@ -63,8 +62,3 @@ get_prop(hal_neuralnetworks_darwinn, vendor_hetero_runtime_prop)
 # Allow DMA Buf access.
 allow hal_neuralnetworks_darwinn dmabuf_system_heap_device:chr_file r_file_perms;

-# Allows the NNAPI HAL to access the graphics_allocator_service.
-# This is required for shared memory buffer allocation.
-# Context:- b/361711471.
-hal_client_domain(hal_neuralnetworks_darwinn, hal_graphics_allocator);
-allow hal_neuralnetworks_darwinn hal_graphics_allocator_service:service_manager find;
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`genfscon sysfs /devices/platform/dwc_dptx-audio/extcon/hdmi_audio u:object_r:sysfs_extcon:s0`
				`@@ -1 +0,0 @@`
				`/vendor/bin/dump/dump_chip_info u:object_r:dump_chip_info_exec:s0`