raviole: Relocate even more things to vendor

Change-Id: Ic7872d3a7cbac2f0c2e01162697567972027389a
2025-11-28 20:28:54 +02:00
parent 5656babfd4
commit 149013e6b3
15 changed files with 138 additions and 464 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,13 +0,0 @@
-BasedOnStyle: Google
-AccessModifierOffset: -2
-AllowShortFunctionsOnASingleLine: Inline
-ColumnLimit: 100
-CommentPragmas: NOLINT:.*
-DerivePointerAlignment: false
-IndentWidth: 4
-ContinuationIndentWidth: 8
-PointerAlignment: Right
-TabWidth: 4
-UseTab: Never
-AllowShortIfStatementsOnASingleLine: false
-SpacesBeforeTrailingComments: 2
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -25,9 +25,6 @@ DEVICE_MANIFEST_FILE += device/google/gs-common/bcmbt/manifest_bluetooth.xml
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/bcmbt/compatibility_matrix.xml

 # Touch
-PRODUCT_PACKAGES += \
-    dump_stm.sh
-
 PRODUCT_VENDOR_PROPERTIES += ro.vendor.touch.dump.sys=/sys/class/spi_master/spi11/spi11.0
 PRODUCT_VENDOR_PROPERTIES += ro.vendor.touch.dump.proc=/proc/fts/driver_test

@@ -78,9 +75,7 @@ PRODUCT_PRODUCT_PROPERTIES +=\
    ro.vendor.vibrator.hal.loc.coeff=2.25 \
    persist.vendor.vibrator.hal.chirp.enabled=0

-# PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/raviole/powerstats/oriole \
    device/google/raviole

 # Keyboard bottom padding in dp for portrait mode
@@ -198,10 +193,6 @@ PRODUCT_PACKAGES += \
    libGLESv1_CM_angle \
    libGLESv2_angle

-# Dumpstate
-PRODUCT_PACKAGES += \
-    dump_gsc.sh
-
 # EUICC
 PRODUCT_COPY_FILES += \
    frameworks/native/data/etc/android.hardware.telephony.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.xml
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -24,10 +24,6 @@ PRODUCT_PACKAGES += \
 DEVICE_MANIFEST_FILE += device/google/gs-common/bcmbt/manifest_bluetooth.xml
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/bcmbt/compatibility_matrix.xml

-# Touch
-PRODUCT_PACKAGES += \
-    dump_lsi.sh
-
 # UWB
 PRODUCT_COPY_FILES += \
    frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.uwb.xml
@@ -91,9 +87,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 # Media Performance Class 12
 PRODUCT_PROPERTY_OVERRIDES += ro.odm.build.media_performance_class=31

-# PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/raviole/powerstats/raven \
    device/google/raviole

 # Increment the SVN for any official public releases
@@ -208,10 +202,6 @@ PRODUCT_PACKAGES += \
    libGLESv1_CM_angle \
    libGLESv2_angle

-# Dumpstate
-PRODUCT_PACKAGES += \
-    dump_gsc.sh
-
 # EUICC
 PRODUCT_COPY_FILES += \
    frameworks/native/data/etc/android.hardware.telephony.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.xml
--- a/oriole/extract-files.py
+++ b/oriole/extract-files.py
@@ -92,6 +92,13 @@ def fix_vendor_file_list(file_list: FileList):
    for file_path in module_suffix_file_paths:
        file_list.get_file(file_path).set_arg(FileArgs.MODULE_SUFFIX, '_vendor')

+    powerstats_service_file_path = (
+        'vendor/bin/hw/android.hardware.power.stats-service.pixel'
+    )
+    file_list.get_file(powerstats_service_file_path).set_arg(
+        FileArgs.REQUIRED, 'pixel_powerstats_xml'
+    )
+

 module.add_generated_proprietary_file(
    'proprietary-files-vendor.txt',
--- a/oriole/proprietary-files-vendor.txt
+++ b/oriole/proprietary-files-vendor.txt
@@ -8,10 +8,26 @@ vendor/bin/aocxd
 vendor/bin/bipchmgr
 vendor/bin/cbd
 vendor/bin/dmd
+vendor/bin/dump/dump_aoc
+vendor/bin/dump/dump_devfreq
+vendor/bin/dump/dump_exynos_display
+vendor/bin/dump/dump_fingerprint
+vendor/bin/dump/dump_gsc.sh
+vendor/bin/dump/dump_modemlog
+vendor/bin/dump/dump_perf
+vendor/bin/dump/dump_pixel_metrics
+vendor/bin/dump/dump_power
+vendor/bin/dump/dump_sensors
+vendor/bin/dump/dump_soc
+vendor/bin/dump/dump_stm.sh
+vendor/bin/dump/dump_storage
+vendor/bin/dump/dump_thermal.sh
+vendor/bin/dump/dump_trusty.sh
 vendor/bin/hw/android.hardware.authsecret-service.citadel
 vendor/bin/hw/android.hardware.biometrics.fingerprint-service.goodix
 vendor/bin/hw/android.hardware.bluetooth-service.bcmbtlinux
 vendor/bin/hw/android.hardware.contexthub-service.generic
+vendor/bin/hw/android.hardware.dumpstate-service
 vendor/bin/hw/android.hardware.edgetpu.logging@service-edgetpu-logging
 vendor/bin/hw/android.hardware.gnss@2.1-service-brcm
 vendor/bin/hw/android.hardware.graphics.allocator-V2-service
@@ -19,6 +35,7 @@ vendor/bin/hw/android.hardware.input.processor-service
 vendor/bin/hw/android.hardware.memtrack-service.pixel
 vendor/bin/hw/android.hardware.neuralnetworks@service-darwinn-aidl
 vendor/bin/hw/android.hardware.oemlock-service.citadel
+vendor/bin/hw/android.hardware.power.stats-service.pixel;REQUIRED=pixel_powerstats_xml
 vendor/bin/hw/android.hardware.secure_element@1.2-uicc-service
 vendor/bin/hw/android.hardware.security.keymint-service.citadel
 vendor/bin/hw/android.hardware.vibrator-service.cs40l25
@@ -46,6 +63,7 @@ vendor/bin/hw/vendor.samsung_slsi.hardware.tetheroffload@1.1-service
 vendor/bin/init.camera.set-interrupts-ownership
 vendor/bin/init.display.sh
 vendor/bin/init.radio.sh
+vendor/bin/insmod.sh
 vendor/bin/modem_logging_control
 vendor/bin/pixelstats-vendor
 vendor/bin/rfsd
@@ -194,16 +212,19 @@ vendor/etc/gnss/gps.cer
 vendor/etc/gnss/gps.xml
 vendor/etc/gnss/lhd.conf
 vendor/etc/gnss/scd.conf
+vendor/etc/init.common.cfg
 vendor/etc/init/Exynos_C2.rc
 vendor/etc/init/android.hardware.authsecret-service.citadel.rc
 vendor/etc/init/android.hardware.bluetooth-service.bcmbtlinux.rc
 vendor/etc/init/android.hardware.camera.provider@2.7-service-google-apex.rc
 vendor/etc/init/android.hardware.contexthub-service.generic.rc
+vendor/etc/init/android.hardware.dumpstate-service.rc
 vendor/etc/init/android.hardware.edgetpu.logging@service-edgetpu-logging.rc
 vendor/etc/init/android.hardware.graphics.allocator2-aidl-service.rc
 vendor/etc/init/android.hardware.input.processor-service.rc
 vendor/etc/init/android.hardware.neuralnetworks@service-darwinn-aidl.rc
 vendor/etc/init/android.hardware.oemlock-service.citadel.rc
+vendor/etc/init/android.hardware.power.stats-service.pixel.rc
 vendor/etc/init/android.hardware.rlsservice-service-google-apex.rc
 vendor/etc/init/android.hardware.secure_element@1.2-uicc-service.rc
 vendor/etc/init/android.hardware.security.keymint-service.citadel.rc
@@ -216,6 +237,7 @@ vendor/etc/init/cbd.rc
 vendor/etc/init/citadeld.rc
 vendor/etc/init/com.google.edgetpu.tachyon-service.rc
 vendor/etc/init/dmd.rc
+vendor/etc/init/dump_power.rc
 vendor/etc/init/fingerprint-goodix.rc
 vendor/etc/init/google.hardware.media.c2@1.0-service.rc
 vendor/etc/init/hw/init.gs101.rc
@@ -223,14 +245,24 @@ vendor/etc/init/hw/init.gs101.storage.rc
 vendor/etc/init/hw/init.gs101.usb.rc
 vendor/etc/init/hw/init.oriole.rc
 vendor/etc/init/hw/init.raviole.rc
+vendor/etc/init/init.aoc.rc
 vendor/etc/init/init.camera.set-interrupts-ownership.rc
+vendor/etc/init/init.fingerprint.dump.rc
 vendor/etc/init/init.gps.rc
 vendor/etc/init/init.modem_logging_control.rc
+vendor/etc/init/init.module.rc
+vendor/etc/init/init.pixel-mm-gs.rc
+vendor/etc/init/init.pixel-perf.rc
+vendor/etc/init/init.power-gs.rc
 vendor/etc/init/init.shared_modem_platform_l.rc
 vendor/etc/init/init.sscoredump.rc
+vendor/etc/init/init.storage.rc
 vendor/etc/init/init.usf.rc
 vendor/etc/init/init.vendor_telephony.rc
 vendor/etc/init/init_dauntless.rc
+vendor/etc/init/libg3a_gabc.rc
+vendor/etc/init/libg3a_gaf.rc
+vendor/etc/init/libg3a_ghawb.rc
 vendor/etc/init/memtrack.rc
 vendor/etc/init/pixelstats-vendor.gs101.rc
 vendor/etc/init/pktrouter.rc
@@ -250,6 +282,9 @@ vendor/etc/init/vendor.google.wireless_charger-default.rc
 vendor/etc/init/vendor.google.wireless_charger.service-default.rc
 vendor/etc/init/vendor.samsung_slsi.hardware.tetheroffload@1.1-service.rc
 vendor/etc/input_classifier_model.pb
+vendor/etc/libg3a_standalone_gabc_rc
+vendor/etc/libg3a_standalone_gaf_rc
+vendor/etc/libg3a_standalone_ghawb_rc
 vendor/etc/libnfc-hal-st.conf
 vendor/etc/libse-gto-hal.conf
 vendor/etc/libse-gto-hal2.conf
@@ -290,6 +325,7 @@ vendor/etc/permissions/android.hardware.telephony.gsm.xml
 vendor/etc/permissions/android.hardware.telephony.ims.singlereg.xml
 vendor/etc/permissions/android.hardware.telephony.ims.xml
 vendor/etc/permissions/com.google.android.camera.experimental2021.xml
+vendor/etc/permissions/vendor.android.hardware.camera.preview-dis.xml
 vendor/etc/pixelstats_config.json
 vendor/etc/powerhint-mainline.json
 vendor/etc/powerhint.json
@@ -318,6 +354,7 @@ vendor/etc/ueventd.rc
 vendor/etc/vintf/manifest/android.hardware.authsecret-service.citadel.xml
 vendor/etc/vintf/manifest/android.hardware.camera.provider@2.7-service-google-apex.xml
 vendor/etc/vintf/manifest/android.hardware.contexthub-service.generic.xml
+vendor/etc/vintf/manifest/android.hardware.dumpstate-service.xml
 vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-brcm.xml
 vendor/etc/vintf/manifest/android.hardware.neuralnetworks@service-darwinn-aidl.xml
 vendor/etc/vintf/manifest/android.hardware.oemlock-service.citadel.xml
@@ -1344,6 +1381,11 @@ vendor/lib/libstreset21.so
 vendor/lib/libsueznanoappclients.so
 vendor/lib/libusf.so
 vendor/lib/libvendorgraphicbuffer.so
+vendor/lib/modem_android_property_manager.so
+vendor/lib/modem_android_property_manager_impl.so
+vendor/lib/modem_clock_manager.so
+vendor/lib/modem_clock_manager_impl.so
+vendor/lib/modem_log_constants.so
 vendor/lib/sensors.usf.so
 vendor/lib/soundfx/liboffloadeffect.so
 vendor/lib/soundfx/libspatialaudio.so
@@ -1361,6 +1403,8 @@ vendor/lib/vendor.samsung_slsi.telephony.hardware.radioExternal@1.0.so
 vendor/lib/vendor.samsung_slsi.telephony.hardware.radioExternal@1.1.so
 vendor/lib64/android.hardware.authsecret-impl.nos.so
 vendor/lib64/android.hardware.oemlock-impl.nos.so
+vendor/lib64/android.hardware.power.stats-impl.gs-common.so
+vendor/lib64/android.hardware.power.stats-impl.gs101.so
 vendor/lib64/android.hardware.security.keymint-impl.nos.so
 vendor/lib64/android.hardware.weaver-bridge.nos.so
 vendor/lib64/android.hardware.weaver-impl.nos.so
@@ -1438,6 +1482,7 @@ vendor/lib64/libdeccfg.so
 vendor/lib64/libdeeptouch.so
 vendor/lib64/libdisplaycolor.so
 vendor/lib64/libdrmresource.so
+vendor/lib64/libdump.so
 vendor/lib64/libedgetpu_client.google.so
 vendor/lib64/libedgetpu_tachyon.google.so
 vendor/lib64/libedgetpu_tflite_compiler.so
@@ -1489,6 +1534,12 @@ vendor/lib64/libvendor.goodix.hardware.biometrics.fingerprint.so
 vendor/lib64/libvendor.goodix.hardware.biometrics.fingerprint@2.1.so
 vendor/lib64/libvendorgraphicbuffer.so
 vendor/lib64/libwlcproto_aidl-default.so
+vendor/lib64/modem_android_property_manager.so
+vendor/lib64/modem_android_property_manager_impl.so
+vendor/lib64/modem_clock_manager.so
+vendor/lib64/modem_clock_manager_impl.so
+vendor/lib64/modem_log_constants.so
+vendor/lib64/modem_log_dumper.so
 vendor/lib64/sensors.usf.so
 vendor/lib64/soundfx/liboffloadeffect.so
 vendor/lib64/soundfx/libspatialaudio.so
--- a/oriole/proprietary-files.txt
+++ b/oriole/proprietary-files.txt
@@ -164,6 +164,10 @@ system_ext/etc/permissions/oemrilhook.xml
 system_ext/framework/oemrilhook.jar
 system_ext/priv-app/OemRilService/OemRilService.apk;PRESIGNED

+# Watchdog
+system_ext/bin/gs_watchdogd
+system_ext/etc/init/init.gs_watchdogd.rc
+
 # VZW
 system_ext/etc/permissions/vzw_mvs_permissions.xml
 system_ext/priv-app/MyVerizonServices/MyVerizonServices.apk;PRESIGNED
--- a/oriole/skip-files-vendor.txt
+++ b/oriole/skip-files-vendor.txt
@@ -35,21 +35,7 @@ bin/dirname
 bin/dmesg
 bin/dos2unix
 bin/du
-bin/dump/dump_aoc
-bin/dump/dump_devfreq
-bin/dump/dump_exynos_display
-bin/dump/dump_fingerprint
 bin/dump/dump_modem
-bin/dump/dump_modemlog
-bin/dump/dump_perf
-bin/dump/dump_pixel_metrics
-bin/dump/dump_power
-bin/dump/dump_sensors
-bin/dump/dump_soc
-bin/dump/dump_stm.sh
-bin/dump/dump_storage
-bin/dump/dump_thermal.sh
-bin/dump/dump_trusty.sh
 bin/dumpsys
 bin/echo
 bin/egrep
@@ -87,7 +73,6 @@ bin/hw/android.hardware.audio.service
 bin/hw/android.hardware.boot-service.default-pixel
 bin/hw/android.hardware.cas@1.2-service
 bin/hw/android.hardware.drm-service.clearkey
-bin/hw/android.hardware.dumpstate-service
 bin/hw/android.hardware.gatekeeper-service.trusty
 bin/hw/android.hardware.graphics.composer@2.4-service
 bin/hw/android.hardware.health-service.gs101
@@ -95,7 +80,6 @@ bin/hw/android.hardware.health.storage-service.default
 bin/hw/android.hardware.media.omx@1.0-service
 bin/hw/android.hardware.nfc-service.st
 bin/hw/android.hardware.power-service.pixel-libperfmgr
-bin/hw/android.hardware.power.stats-service.pixel
 bin/hw/android.hardware.secure_element@1.2-service-gto
 bin/hw/android.hardware.secure_element@1.2-service-gto-ese2
 bin/hw/android.hardware.security.keymint-service.trusty
@@ -117,7 +101,6 @@ bin/id
 bin/ifconfig
 bin/inotifyd
 bin/insmod
-bin/insmod.sh
 bin/install
 bin/ionice
 bin/iorenice
@@ -290,18 +273,15 @@ etc/fstab.zram.60p
 etc/fstab.zram.6g
 etc/group
 etc/hearing_aid_audio_policy_configuration_7_0.xml
-etc/init.common.cfg
 etc/init/android.hardware.audio.service.rc
 etc/init/android.hardware.boot-service.default-pixel.rc
 etc/init/android.hardware.cas@1.2-service.rc
 etc/init/android.hardware.drm-service.clearkey.rc
-etc/init/android.hardware.dumpstate-service.rc
 etc/init/android.hardware.gatekeeper-service.trusty.rc
 etc/init/android.hardware.graphics.composer@2.4-service.rc
 etc/init/android.hardware.health-service.gs101.rc
 etc/init/android.hardware.media.omx@1.0-service.rc
 etc/init/android.hardware.power-service.pixel-libperfmgr.rc
-etc/init/android.hardware.power.stats-service.pixel.rc
 etc/init/android.hardware.secure_element@1.2-service-gto-ese2.rc
 etc/init/android.hardware.secure_element@1.2-service-gto.rc
 etc/init/android.hardware.security.keymint-service.trusty.rc
@@ -313,29 +293,15 @@ etc/init/android.hardware.wifi-service.rc
 etc/init/android.hardware.wifi.supplicant-service.rc
 etc/init/atrace_categories.rc
 etc/init/boringssl_self_test.rc
-etc/init/dump_power.rc
 etc/init/gpu_probe.rc
 etc/init/health-storage-default.rc
 etc/init/hostapd.android.rc
-etc/init/init.aoc.rc
-etc/init/init.fingerprint.dump.rc
-etc/init/init.module.rc
-etc/init/init.pixel-mm-gs.rc
-etc/init/init.pixel-perf.rc
 etc/init/init.pixel.rc
-etc/init/init.power-gs.rc
-etc/init/init.storage.rc
-etc/init/libg3a_gabc.rc
-etc/init/libg3a_gaf.rc
-etc/init/libg3a_ghawb.rc
 etc/init/nfc-service-default.rc
 etc/init/pixel-mm-gki.rc
 etc/init/pixel-thermal-symlinks.rc
 etc/init/rebalance_interrupts-vendor.gs101.rc
 etc/init/vndservicemanager.rc
-etc/libg3a_standalone_gabc_rc
-etc/libg3a_standalone_gaf_rc
-etc/libg3a_standalone_ghawb_rc
 etc/linker.config.pb
 etc/mkshrc
 etc/passwd
@@ -394,7 +360,6 @@ etc/permissions/aosp_excluded_hardware.xml
 etc/permissions/com.nxp.mifare.xml
 etc/permissions/features_com.android.virt.xml
 etc/permissions/handheld_core_hardware.xml
-etc/permissions/vendor.android.hardware.camera.preview-dis.xml
 etc/r_submix_audio_policy_configuration.xml
 etc/selinux/genfs_labels_version.txt
 etc/selinux/plat_pub_versioned.cil
@@ -420,11 +385,9 @@ etc/vintf/compatibility_matrix.xml
 etc/vintf/manifest.xml
 etc/vintf/manifest/android.hardware.cas@1.2-service.xml
 etc/vintf/manifest/android.hardware.drm-service.clearkey.xml
-etc/vintf/manifest/android.hardware.dumpstate-service.xml
 etc/vintf/manifest/android.hardware.gatekeeper-service.trusty.xml
 etc/vintf/manifest/android.hardware.health-service.gs101.xml
 etc/vintf/manifest/android.hardware.power-service.pixel.xml
-etc/vintf/manifest/android.hardware.power.stats-service.pixel.xml
 etc/vintf/manifest/android.hardware.security.keymint-service.trusty.xml
 etc/vintf/manifest/android.hardware.sensors-multihal.xml
 etc/vintf/manifest/android.hardware.thermal-service.pixel.xml
@@ -925,7 +888,6 @@ lib64/android.hardware.common-V2-ndk.so
 lib64/android.hardware.common.fmq-V1-ndk.so
 lib64/android.hardware.drm-V1-ndk.so
 lib64/android.hardware.drm.common-V1-ndk.so
-lib64/android.hardware.dumpstate-V1-ndk.so
 lib64/android.hardware.gatekeeper-V1-ndk.so
 lib64/android.hardware.graphics.allocator-V2-ndk.so
 lib64/android.hardware.graphics.allocator@2.0.so
@@ -951,8 +913,6 @@ lib64/android.hardware.nfc-V1-ndk.so
 lib64/android.hardware.power-V1-ndk.so
 lib64/android.hardware.power-V6-ndk.so
 lib64/android.hardware.power.stats-V2-ndk.so
-lib64/android.hardware.power.stats-impl.gs-common.so
-lib64/android.hardware.power.stats-impl.gs101.so
 lib64/android.hardware.power.stats-impl.pixel.so
 lib64/android.hardware.radio@1.0.so
 lib64/android.hardware.radio@1.1.so
@@ -1027,8 +987,6 @@ lib64/libcrypto.so
 lib64/libcutils.so
 lib64/libdisppower-pixel.so
 lib64/libdmabufheap.so
-lib64/libdump.so
-lib64/libdumpstateutil.so
 lib64/libeffects.so
 lib64/libeffectsconfig.so
 lib64/libenv_filter.dylib.so
@@ -1086,10 +1044,6 @@ lib64/libxml2.so
 lib64/libz.so
 lib64/mediacas/libclearkeycasplugin.so
 lib64/mediadrm/libdrmclearkeyplugin.so
-lib64/modem_android_property_manager.so
-lib64/modem_android_property_manager_impl.so
-lib64/modem_log_constants.so
-lib64/modem_log_dumper.so
 lib64/nfc_nci.st21nfc.default.so
 lib64/pixel-power-ext-V1-ndk.so
 lib64/pixel_stateresidency_provider_aidl_interface-ndk.so
@@ -1221,6 +1175,10 @@ lib64/android.hardware.contexthub-V4-ndk.so
 lib64/chre_atoms_log.so
 lib64/chremetrics-cpp.so

+# Dumpstate
+lib64/android.hardware.dumpstate-V1-ndk.so
+lib64/libdumpstateutil.so
+
 # Fingerprint
 etc/permissions/android.hardware.fingerprint.xml

@@ -1261,20 +1219,16 @@ lib64/pixelpowerstats_provider_aidl_interface-cpp.so
 lib/libpixelatoms_defs.so
 lib/pixelatoms-cpp.so

+# Powerstats
+etc/vintf/manifest/android.hardware.power.stats-service.pixel.xml
+
 # Radio
 lib/libnetutils.so
 lib/libsqlite.so
 lib/libziparchive.so
-lib/modem_android_property_manager.so
-lib/modem_android_property_manager_impl.so
-lib/modem_clock_manager.so
-lib/modem_clock_manager_impl.so
-lib/modem_log_constants.so
 lib64/libnetutils.so
 lib64/libsqlite.so
 lib64/libziparchive.so
-lib64/modem_clock_manager.so
-lib64/modem_clock_manager_impl.so

 # Sensors
 lib/android.frameworks.sensorservice-V1-ndk.so
@@ -1373,7 +1327,6 @@ lib64/com.google.hardware.pixel.display-V15-ndk.so
 lib64/com.google.hardware.pixel.display-V16-ndk.so

 # Misc
-bin/dump/dump_gsc.sh
 lib/libdmabufheap.so
 lib/libdrm.so
 lib/libevent.so
--- a/powerstats/oriole/Android.bp
+++ b/powerstats/oriole/Android.bp
@@ -1,35 +0,0 @@
-//
-// SPDX-FileCopyrightText: 2021 The Android Open Source Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-soong_namespace {
-    imports: [
-        "hardware/google/pixel",
-        "device/google/gs101/powerstats",
-    ]
-}
-
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/raviole:device_google_raviole_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/raviole:device_google_raviole_license",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.power.stats-service.pixel",
-    defaults: ["powerstats_pixel_binary_defaults"],
-
-    srcs: [
-        "*.cpp",
-    ],
-
-    shared_libs: [
-        "android.hardware.power.stats-impl.gs101",
-    ],
-}
--- a/powerstats/oriole/service.cpp
+++ b/powerstats/oriole/service.cpp
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2021 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.
- */
-
-#define LOG_TAG "android.hardware.power.stats-service.pixel"
-
-#include <dataproviders/DisplayStateResidencyDataProvider.h>
-#include <dataproviders/PowerStatsEnergyConsumer.h>
-#include <Gs101CommonDataProviders.h>
-#include <PowerStatsAidl.h>
-
-#include <android-base/logging.h>
-#include <android-base/properties.h>
-#include <android/binder_manager.h>
-#include <android/binder_process.h>
-#include <log/log.h>
-#include <sys/stat.h>
-
-using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider;
-using aidl::android::hardware::power::stats::EnergyConsumerType;
-using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
-
-const char kBootRevision[] = "ro.boot.revision";
-std::map<std::string, std::string> displayChannelNames = {
-    {"PROTO1.0", "PPVAR_VSYS_PWR_DISP"},
-    {"EVT1.0", "PPVAR_VSYS_PWR_DISP"},
-    {"EVT1.1", "VSYS_PWR_DISPLAY"},
-};
-
-void addDisplay(std::shared_ptr<PowerStats> p) {
-    // Add display residency stats
-    struct stat buffer;
-    if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
-        // time_in_state exists
-        addDisplayMrr(p);
-    } else {
-        // time_in_state doesn't exist
-        std::vector<std::string> states = {
-            "Off",
-            "LP: 1080x2400@30",
-            "On: 1080x2400@60",
-            "On: 1080x2400@90",
-            "HBM: 1080x2400@60",
-        };
-
-        p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display",
-                "/sys/class/backlight/panel0-backlight/state",
-                states));
-    }
-
-    std::string rev = android::base::GetProperty(kBootRevision, "");
-
-    std::string channelName;
-    if (displayChannelNames.find(rev) == displayChannelNames.end()) {
-        channelName = displayChannelNames["EVT1.1"];
-    } else {
-        channelName = displayChannelNames[rev];
-    }
-
-    // Add display energy consumer
-    /*
-     * TODO(b/167216667): Add correct display power model here. Must read from display rail
-     * and include proper coefficients for display states.
-     */
-    p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,
-            EnergyConsumerType::DISPLAY, "display", {channelName}, "Display",
-            {{"LP: 1080x2400@30", 1},
-             {"On: 1080x2400@60", 2},
-             {"On: 1080x2400@90", 3},
-             {"HBM: 1080x2400@60", 4}}));
-}
-
-int main() {
-    struct stat buffer;
-
-    LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting.";
-
-    // single thread
-    ABinderProcess_setThreadPoolMaxThreadCount(0);
-
-    std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
-
-    addGs101CommonDataProviders(p);
-    addDisplay(p);
-    if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats");
-    }
-    const std::string instance = std::string() + PowerStats::descriptor + "/default";
-    binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());
-    LOG_ALWAYS_FATAL_IF(status != STATUS_OK);
-
-    ABinderProcess_joinThreadPool();
-    return EXIT_FAILURE;  // should not reach
-}
--- a/powerstats/raven/Android.bp
+++ b/powerstats/raven/Android.bp
@@ -1,35 +0,0 @@
-//
-// SPDX-FileCopyrightText: 2021 The Android Open Source Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-soong_namespace {
-    imports: [
-        "hardware/google/pixel",
-        "device/google/gs101/powerstats",
-    ]
-}
-
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/raviole:device_google_raviole_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: [
-        "//device/google/raviole:device_google_raviole_license",
-    ],
-}
-
-cc_binary {
-    name: "android.hardware.power.stats-service.pixel",
-    defaults: ["powerstats_pixel_binary_defaults"],
-
-    srcs: [
-        "*.cpp",
-    ],
-
-    shared_libs: [
-        "android.hardware.power.stats-impl.gs101",
-    ],
-}
--- a/powerstats/raven/service.cpp
+++ b/powerstats/raven/service.cpp
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2021 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.
- */
-
-#define LOG_TAG "android.hardware.power.stats-service.pixel"
-
-#include <dataproviders/DisplayStateResidencyDataProvider.h>
-#include <dataproviders/GenericStateResidencyDataProvider.h>
-#include <dataproviders/PowerStatsEnergyConsumer.h>
-#include <Gs101CommonDataProviders.h>
-#include <PowerStatsAidl.h>
-
-#include <android-base/logging.h>
-#include <android-base/properties.h>
-#include <android/binder_manager.h>
-#include <android/binder_process.h>
-#include <log/log.h>
-#include <sys/stat.h>
-
-using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider;
-using aidl::android::hardware::power::stats::EnergyConsumerType;
-using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider;
-using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
-
-const char kBootRevision[] = "ro.boot.revision";
-std::map<std::string, std::string> displayChannelNames = {
-    {"PROTO1.0", "PPVAR_VSYS_PWR_DISP"},
-    {"EVT1.0", "PPVAR_VSYS_PWR_DISP"},
-    {"EVT1.1", "VSYS_PWR_DISPLAY"},
-};
-
-void addDisplay(std::shared_ptr<PowerStats> p) {
-    // Add display residency stats
-    struct stat buffer;
-    if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
-        // time_in_state exists
-        addDisplayMrr(p);
-    } else {
-        // time_in_state doesn't exist
-        std::vector<std::string> states = {
-            "Off",
-            "LP: 1440x3120@10",
-            "LP: 1440x3120@30",
-            "On: 1440x3120@10",
-            "On: 1440x3120@30",
-            "On: 1440x3120@60",
-            "On: 1440x3120@90",
-            "On: 1440x3120@120",
-            "HBM: 1440x3120@60",
-        };
-
-        p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display",
-                "/sys/class/backlight/panel0-backlight/state",
-                states));
-    }
-
-    std::string rev = android::base::GetProperty(kBootRevision, "");
-
-    std::string channelName;
-    if (displayChannelNames.find(rev) == displayChannelNames.end()) {
-        channelName = displayChannelNames["EVT1.1"];
-    } else {
-        channelName = displayChannelNames[rev];
-    }
-
-    // Add display energy consumer
-    /*
-     * TODO(b/167216667): Add correct display power model here. Must read from display rail
-     * and include proper coefficients for display states.
-     */
-    p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,
-            EnergyConsumerType::DISPLAY, "display", {channelName}, "Display",
-            {{"LP: 1440x3120@10", 1},
-             {"LP: 1440x3120@30", 2},
-             {"On: 1440x3120@10", 3},
-             {"On: 1440x3120@30", 4},
-             {"On: 1440x3120@60", 5},
-             {"On: 1440x3120@90", 6},
-             {"On: 1440x3120@120", 7},
-             {"HBM: 1440x3120@60", 8}}));
-}
-
-void addUwb(std::shared_ptr<PowerStats> p) {
-    // A constant to represent the number of nanoseconds in one millisecond.
-    const int NS_TO_MS = 1000000;
-
-    // ACPM stats are reported in nanoseconds. The transform function
-    // converts nanoseconds to milliseconds.
-    std::function<uint64_t(uint64_t)> uwbNsToMs = [](uint64_t a) { return a / NS_TO_MS; };
-    const GenericStateResidencyDataProvider::StateResidencyConfig stateConfig = {
-            .entryCountSupported = true,
-            .entryCountPrefix = "count:",
-            .totalTimeSupported = true,
-            .totalTimePrefix = "dur ns:",
-            .totalTimeTransform = uwbNsToMs,
-            .lastEntrySupported = false,
-    };
-
-    const std::vector<std::pair<std::string, std::string>> stateHeaders = {
-            std::make_pair("Off", "Off state:"),
-            std::make_pair("Run", "Run state:"),
-            std::make_pair("Idle", "Idle state:"),
-            std::make_pair("Tx", "Tx state:"),
-            std::make_pair("Rx", "Rx state:"),
-    };
-
-    std::vector<GenericStateResidencyDataProvider::PowerEntityConfig> cfgs;
-    cfgs.emplace_back(generateGenericStateResidencyConfigs(stateConfig, stateHeaders),
-            "UWB", "");
-
-    p->addStateResidencyDataProvider(std::make_unique<GenericStateResidencyDataProvider>(
-            "/sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats", cfgs));
-}
-
-int main() {
-    struct stat buffer;
-
-    LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting.";
-
-    // single thread
-    ABinderProcess_setThreadPoolMaxThreadCount(0);
-
-    std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
-
-    addGs101CommonDataProviders(p);
-    addDisplay(p);
-    if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats", &buffer)) {
-        addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats");
-    }
-    const std::string instance = std::string() + PowerStats::descriptor + "/default";
-    binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());
-    LOG_ALWAYS_FATAL_IF(status != STATUS_OK);
-
-    ABinderProcess_joinThreadPool();
-    return EXIT_FAILURE;  // should not reach
-}
--- a/raven/extract-files.py
+++ b/raven/extract-files.py
@@ -92,6 +92,13 @@ def fix_vendor_file_list(file_list: FileList):
    for file_path in module_suffix_file_paths:
        file_list.get_file(file_path).set_arg(FileArgs.MODULE_SUFFIX, '_vendor')

+    powerstats_service_file_path = (
+        'vendor/bin/hw/android.hardware.power.stats-service.pixel'
+    )
+    file_list.get_file(powerstats_service_file_path).set_arg(
+        FileArgs.REQUIRED, 'pixel_powerstats_xml'
+    )
+

 module.add_generated_proprietary_file(
    'proprietary-files-vendor.txt',
--- a/raven/proprietary-files-vendor.txt
+++ b/raven/proprietary-files-vendor.txt
@@ -8,10 +8,26 @@ vendor/bin/aocxd
 vendor/bin/bipchmgr
 vendor/bin/cbd
 vendor/bin/dmd
+vendor/bin/dump/dump_aoc
+vendor/bin/dump/dump_devfreq
+vendor/bin/dump/dump_exynos_display
+vendor/bin/dump/dump_fingerprint
+vendor/bin/dump/dump_gsc.sh
+vendor/bin/dump/dump_lsi.sh
+vendor/bin/dump/dump_modemlog
+vendor/bin/dump/dump_perf
+vendor/bin/dump/dump_pixel_metrics
+vendor/bin/dump/dump_power
+vendor/bin/dump/dump_sensors
+vendor/bin/dump/dump_soc
+vendor/bin/dump/dump_storage
+vendor/bin/dump/dump_thermal.sh
+vendor/bin/dump/dump_trusty.sh
 vendor/bin/hw/android.hardware.authsecret-service.citadel
 vendor/bin/hw/android.hardware.biometrics.fingerprint-service.goodix
 vendor/bin/hw/android.hardware.bluetooth-service.bcmbtlinux
 vendor/bin/hw/android.hardware.contexthub-service.generic
+vendor/bin/hw/android.hardware.dumpstate-service
 vendor/bin/hw/android.hardware.edgetpu.logging@service-edgetpu-logging
 vendor/bin/hw/android.hardware.gnss@2.1-service-brcm
 vendor/bin/hw/android.hardware.graphics.allocator-V2-service
@@ -19,6 +35,7 @@ vendor/bin/hw/android.hardware.input.processor-service
 vendor/bin/hw/android.hardware.memtrack-service.pixel
 vendor/bin/hw/android.hardware.neuralnetworks@service-darwinn-aidl
 vendor/bin/hw/android.hardware.oemlock-service.citadel
+vendor/bin/hw/android.hardware.power.stats-service.pixel;REQUIRED=pixel_powerstats_xml
 vendor/bin/hw/android.hardware.qorvo.uwb.service
 vendor/bin/hw/android.hardware.secure_element@1.2-uicc-service
 vendor/bin/hw/android.hardware.security.keymint-service.citadel
@@ -48,6 +65,7 @@ vendor/bin/init.camera.set-interrupts-ownership
 vendor/bin/init.display.sh
 vendor/bin/init.radio.sh
 vendor/bin/init.uwb.calib.sh
+vendor/bin/insmod.sh
 vendor/bin/modem_logging_control
 vendor/bin/pixelstats-vendor
 vendor/bin/rfsd
@@ -194,16 +212,19 @@ vendor/etc/gnss/gps.cer
 vendor/etc/gnss/gps.xml
 vendor/etc/gnss/lhd.conf
 vendor/etc/gnss/scd.conf
+vendor/etc/init.common.cfg
 vendor/etc/init/Exynos_C2.rc
 vendor/etc/init/android.hardware.authsecret-service.citadel.rc
 vendor/etc/init/android.hardware.bluetooth-service.bcmbtlinux.rc
 vendor/etc/init/android.hardware.camera.provider@2.7-service-google-apex.rc
 vendor/etc/init/android.hardware.contexthub-service.generic.rc
+vendor/etc/init/android.hardware.dumpstate-service.rc
 vendor/etc/init/android.hardware.edgetpu.logging@service-edgetpu-logging.rc
 vendor/etc/init/android.hardware.graphics.allocator2-aidl-service.rc
 vendor/etc/init/android.hardware.input.processor-service.rc
 vendor/etc/init/android.hardware.neuralnetworks@service-darwinn-aidl.rc
 vendor/etc/init/android.hardware.oemlock-service.citadel.rc
+vendor/etc/init/android.hardware.power.stats-service.pixel.rc
 vendor/etc/init/android.hardware.rlsservice-service-google-apex.rc
 vendor/etc/init/android.hardware.secure_element@1.2-uicc-service.rc
 vendor/etc/init/android.hardware.security.keymint-service.citadel.rc
@@ -216,6 +237,7 @@ vendor/etc/init/cbd.rc
 vendor/etc/init/citadeld.rc
 vendor/etc/init/com.google.edgetpu.tachyon-service.rc
 vendor/etc/init/dmd.rc
+vendor/etc/init/dump_power.rc
 vendor/etc/init/fingerprint-goodix.rc
 vendor/etc/init/google.hardware.media.c2@1.0-service.rc
 vendor/etc/init/hw/init.gs101.rc
@@ -223,14 +245,24 @@ vendor/etc/init/hw/init.gs101.storage.rc
 vendor/etc/init/hw/init.gs101.usb.rc
 vendor/etc/init/hw/init.raven.rc
 vendor/etc/init/hw/init.raviole.rc
+vendor/etc/init/init.aoc.rc
 vendor/etc/init/init.camera.set-interrupts-ownership.rc
+vendor/etc/init/init.fingerprint.dump.rc
 vendor/etc/init/init.gps.rc
 vendor/etc/init/init.modem_logging_control.rc
+vendor/etc/init/init.module.rc
+vendor/etc/init/init.pixel-mm-gs.rc
+vendor/etc/init/init.pixel-perf.rc
+vendor/etc/init/init.power-gs.rc
 vendor/etc/init/init.shared_modem_platform_l.rc
 vendor/etc/init/init.sscoredump.rc
+vendor/etc/init/init.storage.rc
 vendor/etc/init/init.usf.rc
 vendor/etc/init/init.vendor_telephony.rc
 vendor/etc/init/init_dauntless.rc
+vendor/etc/init/libg3a_gabc.rc
+vendor/etc/init/libg3a_gaf.rc
+vendor/etc/init/libg3a_ghawb.rc
 vendor/etc/init/memtrack.rc
 vendor/etc/init/pixelstats-vendor.gs101.rc
 vendor/etc/init/pktrouter.rc
@@ -252,6 +284,9 @@ vendor/etc/init/vendor.google.wireless_charger-default.rc
 vendor/etc/init/vendor.google.wireless_charger.service-default.rc
 vendor/etc/init/vendor.samsung_slsi.hardware.tetheroffload@1.1-service.rc
 vendor/etc/input_classifier_model.pb
+vendor/etc/libg3a_standalone_gabc_rc
+vendor/etc/libg3a_standalone_gaf_rc
+vendor/etc/libg3a_standalone_ghawb_rc
 vendor/etc/libnfc-hal-st.conf
 vendor/etc/libse-gto-hal.conf
 vendor/etc/libse-gto-hal2.conf
@@ -290,6 +325,7 @@ vendor/etc/permissions/android.hardware.telephony.gsm.xml
 vendor/etc/permissions/android.hardware.telephony.ims.singlereg.xml
 vendor/etc/permissions/android.hardware.telephony.ims.xml
 vendor/etc/permissions/com.google.android.camera.experimental2021.xml
+vendor/etc/permissions/vendor.android.hardware.camera.preview-dis.xml
 vendor/etc/pixelstats_config.json
 vendor/etc/powerhint-mainline.json
 vendor/etc/powerhint.json
@@ -369,6 +405,7 @@ vendor/etc/uwb/libuwb-uci.conf
 vendor/etc/vintf/manifest/android.hardware.authsecret-service.citadel.xml
 vendor/etc/vintf/manifest/android.hardware.camera.provider@2.7-service-google-apex.xml
 vendor/etc/vintf/manifest/android.hardware.contexthub-service.generic.xml
+vendor/etc/vintf/manifest/android.hardware.dumpstate-service.xml
 vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-brcm.xml
 vendor/etc/vintf/manifest/android.hardware.neuralnetworks@service-darwinn-aidl.xml
 vendor/etc/vintf/manifest/android.hardware.oemlock-service.citadel.xml
@@ -1395,6 +1432,11 @@ vendor/lib/libstreset21.so
 vendor/lib/libsueznanoappclients.so
 vendor/lib/libusf.so
 vendor/lib/libvendorgraphicbuffer.so
+vendor/lib/modem_android_property_manager.so
+vendor/lib/modem_android_property_manager_impl.so
+vendor/lib/modem_clock_manager.so
+vendor/lib/modem_clock_manager_impl.so
+vendor/lib/modem_log_constants.so
 vendor/lib/sensors.usf.so
 vendor/lib/soundfx/liboffloadeffect.so
 vendor/lib/soundfx/libspatialaudio.so
@@ -1412,6 +1454,8 @@ vendor/lib/vendor.samsung_slsi.telephony.hardware.radioExternal@1.0.so
 vendor/lib/vendor.samsung_slsi.telephony.hardware.radioExternal@1.1.so
 vendor/lib64/android.hardware.authsecret-impl.nos.so
 vendor/lib64/android.hardware.oemlock-impl.nos.so
+vendor/lib64/android.hardware.power.stats-impl.gs-common.so
+vendor/lib64/android.hardware.power.stats-impl.gs101.so
 vendor/lib64/android.hardware.security.keymint-impl.nos.so
 vendor/lib64/android.hardware.weaver-bridge.nos.so
 vendor/lib64/android.hardware.weaver-impl.nos.so
@@ -1489,6 +1533,7 @@ vendor/lib64/libdeccfg.so
 vendor/lib64/libdeeptouch.so
 vendor/lib64/libdisplaycolor.so
 vendor/lib64/libdrmresource.so
+vendor/lib64/libdump.so
 vendor/lib64/libedgetpu_client.google.so
 vendor/lib64/libedgetpu_tachyon.google.so
 vendor/lib64/libedgetpu_tflite_compiler.so
@@ -1541,6 +1586,12 @@ vendor/lib64/libvendor.goodix.hardware.biometrics.fingerprint.so
 vendor/lib64/libvendor.goodix.hardware.biometrics.fingerprint@2.1.so
 vendor/lib64/libvendorgraphicbuffer.so
 vendor/lib64/libwlcproto_aidl-default.so
+vendor/lib64/modem_android_property_manager.so
+vendor/lib64/modem_android_property_manager_impl.so
+vendor/lib64/modem_clock_manager.so
+vendor/lib64/modem_clock_manager_impl.so
+vendor/lib64/modem_log_constants.so
+vendor/lib64/modem_log_dumper.so
 vendor/lib64/sensors.usf.so
 vendor/lib64/soundfx/liboffloadeffect.so
 vendor/lib64/soundfx/libspatialaudio.so
--- a/raven/proprietary-files.txt
+++ b/raven/proprietary-files.txt
@@ -168,6 +168,10 @@ system_ext/priv-app/OemRilService/OemRilService.apk;PRESIGNED
 system_ext/etc/permissions/privapp-permissions-qorvo.xml
 system_ext/priv-app/UwbVendorService/UwbVendorService.apk;PRESIGNED

+# Watchdog
+system_ext/bin/gs_watchdogd
+system_ext/etc/init/init.gs_watchdogd.rc
+
 # VZW
 system_ext/etc/permissions/vzw_mvs_permissions.xml
 system_ext/priv-app/MyVerizonServices/MyVerizonServices.apk;PRESIGNED
--- a/raven/skip-files-vendor.txt
+++ b/raven/skip-files-vendor.txt
@@ -35,21 +35,7 @@ bin/dirname
 bin/dmesg
 bin/dos2unix
 bin/du
-bin/dump/dump_aoc
-bin/dump/dump_devfreq
-bin/dump/dump_exynos_display
-bin/dump/dump_fingerprint
-bin/dump/dump_lsi.sh
 bin/dump/dump_modem
-bin/dump/dump_modemlog
-bin/dump/dump_perf
-bin/dump/dump_pixel_metrics
-bin/dump/dump_power
-bin/dump/dump_sensors
-bin/dump/dump_soc
-bin/dump/dump_storage
-bin/dump/dump_thermal.sh
-bin/dump/dump_trusty.sh
 bin/dumpsys
 bin/echo
 bin/egrep
@@ -87,7 +73,6 @@ bin/hw/android.hardware.audio.service
 bin/hw/android.hardware.boot-service.default-pixel
 bin/hw/android.hardware.cas@1.2-service
 bin/hw/android.hardware.drm-service.clearkey
-bin/hw/android.hardware.dumpstate-service
 bin/hw/android.hardware.gatekeeper-service.trusty
 bin/hw/android.hardware.graphics.composer@2.4-service
 bin/hw/android.hardware.health-service.gs101
@@ -95,7 +80,6 @@ bin/hw/android.hardware.health.storage-service.default
 bin/hw/android.hardware.media.omx@1.0-service
 bin/hw/android.hardware.nfc-service.st
 bin/hw/android.hardware.power-service.pixel-libperfmgr
-bin/hw/android.hardware.power.stats-service.pixel
 bin/hw/android.hardware.secure_element@1.2-service-gto
 bin/hw/android.hardware.secure_element@1.2-service-gto-ese2
 bin/hw/android.hardware.security.keymint-service.trusty
@@ -117,7 +101,6 @@ bin/id
 bin/ifconfig
 bin/inotifyd
 bin/insmod
-bin/insmod.sh
 bin/install
 bin/ionice
 bin/iorenice
@@ -290,18 +273,15 @@ etc/fstab.zram.60p
 etc/fstab.zram.6g
 etc/group
 etc/hearing_aid_audio_policy_configuration_7_0.xml
-etc/init.common.cfg
 etc/init/android.hardware.audio.service.rc
 etc/init/android.hardware.boot-service.default-pixel.rc
 etc/init/android.hardware.cas@1.2-service.rc
 etc/init/android.hardware.drm-service.clearkey.rc
-etc/init/android.hardware.dumpstate-service.rc
 etc/init/android.hardware.gatekeeper-service.trusty.rc
 etc/init/android.hardware.graphics.composer@2.4-service.rc
 etc/init/android.hardware.health-service.gs101.rc
 etc/init/android.hardware.media.omx@1.0-service.rc
 etc/init/android.hardware.power-service.pixel-libperfmgr.rc
-etc/init/android.hardware.power.stats-service.pixel.rc
 etc/init/android.hardware.secure_element@1.2-service-gto-ese2.rc
 etc/init/android.hardware.secure_element@1.2-service-gto.rc
 etc/init/android.hardware.security.keymint-service.trusty.rc
@@ -313,29 +293,15 @@ etc/init/android.hardware.wifi-service.rc
 etc/init/android.hardware.wifi.supplicant-service.rc
 etc/init/atrace_categories.rc
 etc/init/boringssl_self_test.rc
-etc/init/dump_power.rc
 etc/init/gpu_probe.rc
 etc/init/health-storage-default.rc
 etc/init/hostapd.android.rc
-etc/init/init.aoc.rc
-etc/init/init.fingerprint.dump.rc
-etc/init/init.module.rc
-etc/init/init.pixel-mm-gs.rc
-etc/init/init.pixel-perf.rc
 etc/init/init.pixel.rc
-etc/init/init.power-gs.rc
-etc/init/init.storage.rc
-etc/init/libg3a_gabc.rc
-etc/init/libg3a_gaf.rc
-etc/init/libg3a_ghawb.rc
 etc/init/nfc-service-default.rc
 etc/init/pixel-mm-gki.rc
 etc/init/pixel-thermal-symlinks.rc
 etc/init/rebalance_interrupts-vendor.gs101.rc
 etc/init/vndservicemanager.rc
-etc/libg3a_standalone_gabc_rc
-etc/libg3a_standalone_gaf_rc
-etc/libg3a_standalone_ghawb_rc
 etc/linker.config.pb
 etc/mkshrc
 etc/passwd
@@ -395,7 +361,6 @@ etc/permissions/aosp_excluded_hardware.xml
 etc/permissions/com.nxp.mifare.xml
 etc/permissions/features_com.android.virt.xml
 etc/permissions/handheld_core_hardware.xml
-etc/permissions/vendor.android.hardware.camera.preview-dis.xml
 etc/r_submix_audio_policy_configuration.xml
 etc/selinux/genfs_labels_version.txt
 etc/selinux/plat_pub_versioned.cil
@@ -421,11 +386,9 @@ etc/vintf/compatibility_matrix.xml
 etc/vintf/manifest.xml
 etc/vintf/manifest/android.hardware.cas@1.2-service.xml
 etc/vintf/manifest/android.hardware.drm-service.clearkey.xml
-etc/vintf/manifest/android.hardware.dumpstate-service.xml
 etc/vintf/manifest/android.hardware.gatekeeper-service.trusty.xml
 etc/vintf/manifest/android.hardware.health-service.gs101.xml
 etc/vintf/manifest/android.hardware.power-service.pixel.xml
-etc/vintf/manifest/android.hardware.power.stats-service.pixel.xml
 etc/vintf/manifest/android.hardware.security.keymint-service.trusty.xml
 etc/vintf/manifest/android.hardware.sensors-multihal.xml
 etc/vintf/manifest/android.hardware.thermal-service.pixel.xml
@@ -926,7 +889,6 @@ lib64/android.hardware.common-V2-ndk.so
 lib64/android.hardware.common.fmq-V1-ndk.so
 lib64/android.hardware.drm-V1-ndk.so
 lib64/android.hardware.drm.common-V1-ndk.so
-lib64/android.hardware.dumpstate-V1-ndk.so
 lib64/android.hardware.gatekeeper-V1-ndk.so
 lib64/android.hardware.graphics.allocator-V2-ndk.so
 lib64/android.hardware.graphics.allocator@2.0.so
@@ -952,8 +914,6 @@ lib64/android.hardware.nfc-V1-ndk.so
 lib64/android.hardware.power-V1-ndk.so
 lib64/android.hardware.power-V6-ndk.so
 lib64/android.hardware.power.stats-V2-ndk.so
-lib64/android.hardware.power.stats-impl.gs-common.so
-lib64/android.hardware.power.stats-impl.gs101.so
 lib64/android.hardware.power.stats-impl.pixel.so
 lib64/android.hardware.radio@1.0.so
 lib64/android.hardware.radio@1.1.so
@@ -1028,8 +988,6 @@ lib64/libcrypto.so
 lib64/libcutils.so
 lib64/libdisppower-pixel.so
 lib64/libdmabufheap.so
-lib64/libdump.so
-lib64/libdumpstateutil.so
 lib64/libeffects.so
 lib64/libeffectsconfig.so
 lib64/libenv_filter.dylib.so
@@ -1087,10 +1045,6 @@ lib64/libxml2.so
 lib64/libz.so
 lib64/mediacas/libclearkeycasplugin.so
 lib64/mediadrm/libdrmclearkeyplugin.so
-lib64/modem_android_property_manager.so
-lib64/modem_android_property_manager_impl.so
-lib64/modem_log_constants.so
-lib64/modem_log_dumper.so
 lib64/nfc_nci.st21nfc.default.so
 lib64/pixel-power-ext-V1-ndk.so
 lib64/pixel_stateresidency_provider_aidl_interface-ndk.so
@@ -1222,6 +1176,10 @@ lib64/android.hardware.contexthub-V4-ndk.so
 lib64/chre_atoms_log.so
 lib64/chremetrics-cpp.so

+# Dumpstate
+lib64/android.hardware.dumpstate-V1-ndk.so
+lib64/libdumpstateutil.so
+
 # Fingerprint
 etc/permissions/android.hardware.fingerprint.xml

@@ -1262,20 +1220,16 @@ lib64/pixelpowerstats_provider_aidl_interface-cpp.so
 lib/libpixelatoms_defs.so
 lib/pixelatoms-cpp.so

+# Powerstats
+etc/vintf/manifest/android.hardware.power.stats-service.pixel.xml
+
 # Radio
 lib/libnetutils.so
 lib/libsqlite.so
 lib/libziparchive.so
-lib/modem_android_property_manager.so
-lib/modem_android_property_manager_impl.so
-lib/modem_clock_manager.so
-lib/modem_clock_manager_impl.so
-lib/modem_log_constants.so
 lib64/libnetutils.so
 lib64/libsqlite.so
 lib64/libziparchive.so
-lib64/modem_clock_manager.so
-lib64/modem_clock_manager_impl.so

 # Sensors
 lib/android.frameworks.sensorservice-V1-ndk.so
@@ -1374,7 +1328,6 @@ lib64/com.google.hardware.pixel.display-V15-ndk.so
 lib64/com.google.hardware.pixel.display-V16-ndk.so

 # Misc
-bin/dump/dump_gsc.sh
 lib/libdmabufheap.so
 lib/libdrm.so
 lib/libevent.so