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

Commit 31255052 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master

parents 66c0e03f 0bf8f212
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -64,4 +64,5 @@ cc_binary {
        "android.hardware.automotive@libc++fs",
        "libnl++",
    ],
    vintf_fragments: ["manifest_android.hardware.automotive.can@1.0.xml"],
}
+22 −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.can</name>
        <transport>hwbinder</transport>
        <fqname>@1.0::ICanController/socketcan</fqname>
    </hal>
</manifest>
+129 −145

File changed.

Preview size limit exceeded, changes collapsed.

+25 −17

File changed.

Preview size limit exceeded, changes collapsed.

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ cc_test {
    ],
    shared_libs: [
        "libbase",
        "libcutils",
    ],
    header_libs: ["libbase_headers"],
    test_suites: ["general-tests"],
Loading