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

Commit cbc6a330 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12L

Bug: 222710654
Merged-In: Ib7ed106fb09dcfa246bd0a31515fbbb358259de0
Change-Id: Ifb4059c9c03a8a1ff6a1efd952dd088f0e5a8a9d
parents 90019d46 bfdd991c
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ cc_binary {
        "android.hardware.automotive@libc++fs",
        "libnl++",
    ],
    vintf_fragments: ["manifest_android.hardware.automotive.can@1.0.xml"],
}

filegroup {
+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
@@ -185,6 +185,7 @@ cc_test {
    ],
    shared_libs: [
        "libbase",
        "libcutils",
    ],
    header_libs: ["libbase_headers"],
    test_suites: ["general-tests"],
Loading