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

Commit ef385175 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Drop references to CAN HAL from libnetdevice and libnl++ 

Bug: 310710841
Test: m
Change-Id: I362bb91860fa2e78168b4b27a1c9b36d1c23ba7e
Merged-In: I362bb91860fa2e78168b4b27a1c9b36d1c23ba7e
parent 8925adb1

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