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

Commit 37c5495a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Drop references to CAN HAL from libnetdevice and libnl++" into main am: 2764f622 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3349682



Change-Id: I2884f6f4e5aecc23143fa3fc8524242f19b00a7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9f759f8 2764f622

automotive/can/1.0/default/libnetdevice/Android.bp

+23 −3
Original line number Diff line number Diff line
@@ -23,10 +23,19 @@ 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",

    vendor_available: true,

    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",

    ],

    shared_libs: [

        "libbase",

        "libutils",

    ],

    srcs: [

        "can.cpp",

        "common.cpp",
@@ -40,3 +49,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"],

}

automotive/can/1.0/default/libnl++/Android.bp

+10 −1
Original line number Diff line number Diff line
@@ -25,8 +25,17 @@ package { 


cc_library_static {

    name: "libnl++",

    defaults: ["android.hardware.automotive.can@defaults"],

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