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

Commit b6e37a46 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: e52de760... 

Merge "Replace llndk_library with llndk clause in cc_library" am: e52de760 am: 77e5d8b1 am: 5028327b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1684207

Change-Id: If7e74bb03bd9f8141e4576ed32f9e1c698636fa9
parents 7bb420d7 5028327b

libprocessgroup/cgrouprc/Android.bp

+3 −10
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ cc_library { 
    // defined below. The static library is built for tests.

    vendor_available: false,

    native_bridge_supported: true,

    llndk_stubs: "libcgrouprc.llndk",

    llndk: {

        symbol_file: "libcgrouprc.map.txt",

    },

    srcs: [

        "cgroup_controller.cpp",

        "cgroup_file.cpp",
@@ -59,12 +61,3 @@ cc_library { 
        },

    },

}
 


llndk_library {

    name: "libcgrouprc.llndk",

    symbol_file: "libcgrouprc.map.txt",

    native_bridge_supported: true,

    export_include_dirs: [

        "include",

    ],

}

libsync/Android.bp

+3 −7
Original line number Diff line number Diff line
@@ -42,7 +42,9 @@ cc_library { 
    recovery_available: true,

    native_bridge_supported: true,

    defaults: ["libsync_defaults"],

    llndk_stubs: "libsync.llndk",

    llndk: {

        symbol_file: "libsync.map.txt",

    },

    stubs: {

        symbol_file: "libsync.map.txt",

        versions: [
@@ -51,12 +53,6 @@ cc_library { 
    },

}



llndk_library {

    name: "libsync.llndk",

    symbol_file: "libsync.map.txt",

    export_include_dirs: ["include"],

}



cc_test {

    name: "sync-unit-tests",

    shared_libs: ["libsync"],

libvndksupport/Android.bp

+3 −8
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ package { 
cc_library {

    name: "libvndksupport",

    native_bridge_supported: true,

    llndk_stubs: "libvndksupport.llndk",

    llndk: {

        symbol_file: "libvndksupport.map.txt",

    },

    srcs: ["linker.cpp"],

    cflags: [

        "-Wall",
@@ -23,10 +25,3 @@ cc_library { 
        versions: ["29"],

    },

}
 


llndk_library {

    name: "libvndksupport.llndk",

    native_bridge_supported: true,

    symbol_file: "libvndksupport.map.txt",

    export_include_dirs: ["include"],

}