summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-07 00:02:03 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-07 00:02:03 +0000
commit2ab6633dc3b61eb789b41754b5c7ad7c776dceb4 (patch)
tree57cd0bd81cbbf15027b8019449b163ac84c2dedf
parent968c69de0da9faaa79f2841cc00e5a0f269f2e1c (diff)
parenta2074a43638f343dfa2f64c6f2da679ba4e78361 (diff)
downloadgs101-2ab6633dc3b61eb789b41754b5c7ad7c776dceb4.tar.gz
Snap for 11186783 from a2074a43638f343dfa2f64c6f2da679ba4e78361 to 24Q1-release
Change-Id: I7a2fa229eceec32b650d9a8c2ff0865dba6635ec
-rw-r--r--device.mk2
-rw-r--r--manifest.xml5
-rw-r--r--manifest_64.xml5
3 files changed, 5 insertions, 7 deletions
diff --git a/device.mk b/device.mk
index 9310b4d1..fe6fbbed 100644
--- a/device.mk
+++ b/device.mk
@@ -35,7 +35,7 @@ include device/google/gs-common/widevine/widevine.mk
include device/google/gs-common/sota_app/factoryota.mk
include device/google/gs-common/misc_writer/misc_writer.mk
include device/google/gs-common/gyotaku_app/gyotaku.mk
-include device/google/gs-common/bootctrl/bootctrl_hidl_1.2.mk
+include device/google/gs-common/bootctrl/bootctrl_aidl.mk
TARGET_BOARD_PLATFORM := gs101
DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
diff --git a/manifest.xml b/manifest.xml
index 303ed2ca..fdc85f37 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -30,10 +30,9 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
+ <hal format="aidl">
<name>android.hardware.boot</name>
- <transport>hwbinder</transport>
- <fqname>@1.2::IBootControl/default</fqname>
+ <fqname>IBootControl/default</fqname>
</hal>
<hal format="aidl">
<name>com.google.input</name>
diff --git a/manifest_64.xml b/manifest_64.xml
index 115357d6..5f6d83ae 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -17,10 +17,9 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
+ <hal format="aidl">
<name>android.hardware.boot</name>
- <transport>hwbinder</transport>
- <fqname>@1.2::IBootControl/default</fqname>
+ <fqname>IBootControl/default</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>