Merge "Fix requests for IBootControl 1.0 when using the 1.1 HAL."

am: 80c288d7b3

Change-Id: I32de834b3f848c888a8bb0a3b8ec5e0945dfe4c5
This commit is contained in:
David Anderson 2019-10-17 15:07:08 -07:00 committed by android-build-merger
commit a8d3c3e9d6
3 changed files with 14 additions and 2 deletions

View file

@ -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",

View file

@ -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>

View file

@ -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>();