diff options
| author | David Anderson <dvander@google.com> | 2019-10-12 15:19:53 -0700 |
|---|---|---|
| committer | David Anderson <dvander@google.com> | 2019-10-17 20:46:07 +0000 |
| commit | c07c90699a738ccb0725c5f37088f9d28ac6b1e2 (patch) | |
| tree | 2f5e14c7c5f2193f986c0294b25eb12c8f131c1a /boot | |
| parent | 9e3a3a1f1c88008baa16f4fe30885dc56d66acb5 (diff) | |
Fix requests for IBootControl 1.0 when using the 1.1 HAL.
Bug: 138861550
Test: cuttlefish boots
Change-Id: I10587a70dca716366a5cf48c8bc8c1bc4fb9f93a
Merged-In: I10587a70dca716366a5cf48c8bc8c1bc4fb9f93a
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/1.1/default/Android.bp | 5 | ||||
| -rw-r--r-- | boot/1.1/default/android.hardware.boot@1.1.xml | 7 | ||||
| -rw-r--r-- | boot/1.1/default/service.cpp | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/boot/1.1/default/Android.bp b/boot/1.1/default/Android.bp index dca5c2635a..abf1bf9530 100644 --- a/boot/1.1/default/Android.bp +++ b/boot/1.1/default/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { name: "android.hardware.boot@1.1-impl", + stem: "android.hardware.boot@1.0-impl-1.1", defaults: [ "hidl_defaults", "libboot_control_defaults", @@ -31,6 +32,10 @@ cc_binary { init_rc: ["android.hardware.boot@1.1-service.rc"], srcs: ["service.cpp"], + vintf_fragments: [ + "android.hardware.boot@1.1.xml", + ], + shared_libs: [ "liblog", "libhardware", diff --git a/boot/1.1/default/android.hardware.boot@1.1.xml b/boot/1.1/default/android.hardware.boot@1.1.xml new file mode 100644 index 0000000000..83d5d2e8de --- /dev/null +++ b/boot/1.1/default/android.hardware.boot@1.1.xml @@ -0,0 +1,7 @@ +<manifest version="1.0" type="device"> + <hal format="hidl"> + <name>android.hardware.boot</name> + <transport>hwbinder</transport> + <fqname>@1.1::IBootControl/default</fqname> + </hal> +</manifest> diff --git a/boot/1.1/default/service.cpp b/boot/1.1/default/service.cpp index b24b46456a..93eaedab8d 100644 --- a/boot/1.1/default/service.cpp +++ b/boot/1.1/default/service.cpp @@ -15,11 +15,11 @@ */ #define LOG_TAG "android.hardware.boot@1.1-service" -#include <android/hardware/boot/1.1/IBootControl.h> +#include <android/hardware/boot/1.0/IBootControl.h> #include <hidl/LegacySupport.h> using android::hardware::defaultPassthroughServiceImplementation; -using ::android::hardware::boot::V1_1::IBootControl; +using ::android::hardware::boot::V1_0::IBootControl; int main(int /* argc */, char* /* argv */[]) { return defaultPassthroughServiceImplementation<IBootControl>(); |