Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20101985 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Using VINTF manifest fragment" into rvc-dev am: d11d6ee0

Change-Id: I7cafe7de6930d1d756dfa12e8934d4de3b0c0594
parents 31400af2 d11d6ee0
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -27,4 +27,8 @@ cc_binary {
        "-O0",
        "-g",
    ],

    vintf_fragments: [
        "manifest_android.hardware.automotive.evs@1.0-service.xml",
    ],
}
+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@
 * limitations under the License.
 */

const static char kEnumeratorServiceName[] = "EvsEnumeratorHw";
const static char kEnumeratorServiceName[] = "hw/0";
+26 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 2020 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.
-->
<manifest version="1.0" type="device" >
    <hal format="hidl">
        <name>android.hardware.automotive.evs</name>
        <transport>hwbinder</transport>
        <version>1.0</version>
        <interface>
            <name>IEvsEnumerator</name>
            <instance>hw/0</instance>
        </interface>
    </hal>
</manifest>
+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ cc_binary {
    required: [
        "evs_default_configuration.xml",
    ],

    vintf_fragments: [
        "manifest_android.hardware.automotive.evs@1.1-service.xml",
    ],
}

prebuilt_etc {
+26 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 2020 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.
-->
<manifest version="1.0" type="device" >
    <hal format="hidl">
        <name>android.hardware.automotive.evs</name>
        <transport>hwbinder</transport>
        <version>1.1</version>
        <interface>
            <name>IEvsEnumerator</name>
            <instance>hw/0</instance>
        </interface>
    </hal>
</manifest>