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

Commit b81f4c52 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Replace llndk_library with llndk clause in cc_library" am: 9e9d7bd0... 

Merge "Replace llndk_library with llndk clause in cc_library" am: 9e9d7bd0 am: f9abc183 am: 5bc3c6ad am: 875493dc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684529

Change-Id: I3fccfd0d557d8534f4e3ed436478b01c8a79514c
parents ab731a19 875493dc

native/android/Android.bp

+5 −8
Original line number Original line Diff line number Diff line
@@ -127,7 +127,11 @@ cc_library_shared { 
cc_library_shared {

cc_library_shared {

    name: "libandroid_net",

    name: "libandroid_net",

    defaults: ["libandroid_defaults"],

    defaults: ["libandroid_defaults"],

    llndk_stubs: "libandroid_net.llndk",

    llndk: {

        symbol_file: "libandroid_net.map.txt",

        unversioned: true,

        override_export_include_dirs: ["include"],

    },

    srcs: ["net.c"],

    srcs: ["net.c"],





    shared_libs: ["libnetd_client"],

    shared_libs: ["libnetd_client"],
@@ -135,13 +139,6 @@ cc_library_shared { 
    include_dirs: ["bionic/libc/dns/include"],

    include_dirs: ["bionic/libc/dns/include"],

}

}





llndk_library {

    name: "libandroid_net.llndk",

    export_include_dirs: ["include"],

    symbol_file: "libandroid_net.map.txt",

    unversioned: true,

}



// Aidl library for platform compat.

// Aidl library for platform compat.

cc_library_shared {

cc_library_shared {

    name: "lib-platform-compat-native-api",

    name: "lib-platform-compat-native-api",