diff options
| -rw-r--r-- | bonito/proprietary-files-vendor.txt | 4 | ||||
| -rwxr-xr-x | bonito/regen-vendor.sh | 6 | ||||
| -rw-r--r-- | device_framework_matrix.xml | 8 | ||||
| -rw-r--r-- | manifest.xml | 9 | ||||
| -rw-r--r-- | sargo/proprietary-files-vendor.txt | 4 | ||||
| -rwxr-xr-x | sargo/regen-vendor.sh | 6 |
6 files changed, 12 insertions, 25 deletions
diff --git a/bonito/proprietary-files-vendor.txt b/bonito/proprietary-files-vendor.txt index 9cb304b9..f9dcf28c 100644 --- a/bonito/proprietary-files-vendor.txt +++ b/bonito/proprietary-files-vendor.txt @@ -24,7 +24,6 @@ vendor/bin/hw/citadel_updater vendor/bin/hw/citadeld vendor/bin/hw/init_citadel vendor/bin/hw/qcrild -vendor/bin/hw/vendor.google.google_battery@1.1-service-vendor vendor/bin/hw/vendor.google.radioext@1.0-service vendor/bin/hw/vendor.google.wifi_ext@1.0-service-vendor vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti @@ -179,7 +178,6 @@ vendor/etc/init/init.time_daemon.rc vendor/etc/init/init_citadel.rc vendor/etc/init/qcrild.rc vendor/etc/init/rebootescrow-citadel.rc -vendor/etc/init/vendor.google.google_battery@1.1-service.rc vendor/etc/init/vendor.google.radioext@1.0-service.rc vendor/etc/init/vendor.google.wifi_ext@1.0-service.rc vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc @@ -953,8 +951,6 @@ vendor/lib64/vendor.display.color@1.0.so vendor/lib64/vendor.display.color@1.1.so vendor/lib64/vendor.display.color@1.2.so vendor/lib64/vendor.display.postproc@1.0.so -vendor/lib64/vendor.google.google_battery@1.0.so -vendor/lib64/vendor.google.google_battery@1.1.so vendor/lib64/vendor.google.radioext@1.0.so vendor/lib64/vendor.google.radioext@1.1.so vendor/lib64/vendor.google.radioext@1.2.so diff --git a/bonito/regen-vendor.sh b/bonito/regen-vendor.sh index f2e9c5d8..f171d60c 100755 --- a/bonito/regen-vendor.sh +++ b/bonito/regen-vendor.sh @@ -1106,6 +1106,12 @@ VENDOR_SKIP_FILES=( "lib/libdisplayconfig.so" "lib64/libdisplayconfig.so" + # Google battery + "bin/hw/vendor.google.google_battery@1.1-service-vendor" + "etc/init/vendor.google.google_battery@1.1-service.rc" + "lib64/vendor.google.google_battery@1.0.so" + "lib64/vendor.google.google_battery@1.1.so" + # IOP "lib/vendor.qti.hardware.iop@1.0.so" "lib64/vendor.qti.hardware.iop@1.0.so" diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml index 9f507756..3236a4fb 100644 --- a/device_framework_matrix.xml +++ b/device_framework_matrix.xml @@ -54,14 +54,6 @@ </interface> </hal> <hal format="hidl" optional="true"> - <name>vendor.google.google_battery</name> - <version>1.1</version> - <interface> - <name>IGoogleBattery</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl" optional="true"> <name>vendor.google.radioext</name> <version>1.3</version> <interface> diff --git a/manifest.xml b/manifest.xml index 0f78cf0e..3568f0b8 100644 --- a/manifest.xml +++ b/manifest.xml @@ -283,15 +283,6 @@ </interface> </hal> <hal format="hidl"> - <name>vendor.google.google_battery</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IGoogleBattery</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.sensors</name> <transport>hwbinder</transport> <version>2.0</version> diff --git a/sargo/proprietary-files-vendor.txt b/sargo/proprietary-files-vendor.txt index 7ad2a075..24d3ae7b 100644 --- a/sargo/proprietary-files-vendor.txt +++ b/sargo/proprietary-files-vendor.txt @@ -24,7 +24,6 @@ vendor/bin/hw/citadel_updater vendor/bin/hw/citadeld vendor/bin/hw/init_citadel vendor/bin/hw/qcrild -vendor/bin/hw/vendor.google.google_battery@1.1-service-vendor vendor/bin/hw/vendor.google.radioext@1.0-service vendor/bin/hw/vendor.google.wifi_ext@1.0-service-vendor vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti @@ -179,7 +178,6 @@ vendor/etc/init/init.time_daemon.rc vendor/etc/init/init_citadel.rc vendor/etc/init/qcrild.rc vendor/etc/init/rebootescrow-citadel.rc -vendor/etc/init/vendor.google.google_battery@1.1-service.rc vendor/etc/init/vendor.google.radioext@1.0-service.rc vendor/etc/init/vendor.google.wifi_ext@1.0-service.rc vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc @@ -952,8 +950,6 @@ vendor/lib64/vendor.display.color@1.0.so vendor/lib64/vendor.display.color@1.1.so vendor/lib64/vendor.display.color@1.2.so vendor/lib64/vendor.display.postproc@1.0.so -vendor/lib64/vendor.google.google_battery@1.0.so -vendor/lib64/vendor.google.google_battery@1.1.so vendor/lib64/vendor.google.radioext@1.0.so vendor/lib64/vendor.google.radioext@1.1.so vendor/lib64/vendor.google.radioext@1.2.so diff --git a/sargo/regen-vendor.sh b/sargo/regen-vendor.sh index 6f8ac7b4..d6ae4d6b 100755 --- a/sargo/regen-vendor.sh +++ b/sargo/regen-vendor.sh @@ -1106,6 +1106,12 @@ VENDOR_SKIP_FILES=( "lib/libdisplayconfig.so" "lib64/libdisplayconfig.so" + # Google battery + "bin/hw/vendor.google.google_battery@1.1-service-vendor" + "etc/init/vendor.google.google_battery@1.1-service.rc" + "lib64/vendor.google.google_battery@1.0.so" + "lib64/vendor.google.google_battery@1.1.so" + # IOP "lib/vendor.qti.hardware.iop@1.0.so" "lib64/vendor.qti.hardware.iop@1.0.so" |