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

Commit f066f5d4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Drop references to CAN HAL from libnetdevice and libnl++" into main

parents 59682e80 3aa93292
Loading
Loading
Loading
Loading
+23 −3
Original line number Diff line number Diff line
@@ -23,11 +23,20 @@ package {
    default_applicable_licenses: ["hardware_interfaces_license"],
}

cc_library_static {
    name: "android.hardware.automotive.can@libnetdevice",
    defaults: ["android.hardware.automotive.can@defaults"],
cc_defaults {
    name: "libnetdevice-common",
    host_supported: true,
    vendor_available: true,
    cflags: [
        "-Wall",
        "-Wextra",
        "-Werror",
        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
    ],
    shared_libs: [
        "libbase",
        "libutils",
    ],
    srcs: [
        "can.cpp",
        "common.cpp",
@@ -41,3 +50,14 @@ cc_library_static {
        "libnl++",
    ],
}

// TODO: migrate to "libnetdevice" and remove
cc_library_static {
    name: "android.hardware.automotive.can@libnetdevice",
    defaults: ["libnetdevice-common"],
}

cc_library_static {
    name: "libnetdevice",
    defaults: ["libnetdevice-common"],
}
+10 −1
Original line number Diff line number Diff line
@@ -25,9 +25,18 @@ package {

cc_library_static {
    name: "libnl++",
    defaults: ["android.hardware.automotive.can@defaults"],
    host_supported: true,
    vendor_available: true,
    cflags: [
        "-Wall",
        "-Wextra",
        "-Werror",
        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
    ],
    shared_libs: [
        "libbase",
        "libutils",
    ],
    srcs: [
        "protocols/common/Empty.cpp",
        "protocols/common/Error.cpp",