Replace llndk_library with llndk clause in cc_library

Remove the vestigial llndk_library modules and replace them with
properties in the llndk clause of the implementation cc_library.

Bug: 170784825
Test: m checkbuild
Test: compare out/soong/build.ninja
Change-Id: Ie3a1bffcf29bb1b6747f7f708826c61bd43ba5a1
This commit is contained in:
Colin Cross 2021-04-21 19:13:41 -07:00
parent d684952fa7
commit 176ec1b805
3 changed files with 9 additions and 25 deletions

View file

@ -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",
],
}

View file

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

View file

@ -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"],
}