Make the connection between implementation and llndk_library explicit
Instead of assuming a module with the .llndk suffix exists, add an
llndk_stubs property to every cc_library module that has a
corresponding llndk_library. Also rename the llndk_library to have
an explicit .llndk suffix.
Bug: 170784825
Test: no changes to build.ninja (excluding comments) or Android-${TARGET_PRODUCT}.mk
Change-Id: Ifba79a1ae64a67a9d7393dac2fb012cd8af8e149
diff --git a/libprocessgroup/cgrouprc/Android.bp b/libprocessgroup/cgrouprc/Android.bp
index 0af75bb..a107baa 100644
--- a/libprocessgroup/cgrouprc/Android.bp
+++ b/libprocessgroup/cgrouprc/Android.bp
@@ -22,6 +22,7 @@
// defined below. The static library is built for tests.
vendor_available: false,
native_bridge_supported: true,
+ llndk_stubs: "libcgrouprc.llndk",
srcs: [
"cgroup_controller.cpp",
"cgroup_file.cpp",
@@ -54,7 +55,7 @@
}
llndk_library {
- name: "libcgrouprc",
+ name: "libcgrouprc.llndk",
symbol_file: "libcgrouprc.llndk.txt",
native_bridge_supported: true,
export_include_dirs: [
diff --git a/libsync/Android.bp b/libsync/Android.bp
index bad6230..4828892 100644
--- a/libsync/Android.bp
+++ b/libsync/Android.bp
@@ -25,6 +25,7 @@
recovery_available: true,
native_bridge_supported: true,
defaults: ["libsync_defaults"],
+ llndk_stubs: "libsync.llndk",
stubs: {
symbol_file: "libsync.map.txt",
versions: [
@@ -34,7 +35,7 @@
}
llndk_library {
- name: "libsync",
+ name: "libsync.llndk",
symbol_file: "libsync.map.txt",
export_include_dirs: ["include"],
}
diff --git a/libvndksupport/Android.bp b/libvndksupport/Android.bp
index b92c76c..a5cece4 100644
--- a/libvndksupport/Android.bp
+++ b/libvndksupport/Android.bp
@@ -1,6 +1,7 @@
cc_library {
name: "libvndksupport",
native_bridge_supported: true,
+ llndk_stubs: "libvndksupport.llndk",
srcs: ["linker.cpp"],
cflags: [
"-Wall",
@@ -20,7 +21,7 @@
}
llndk_library {
- name: "libvndksupport",
+ name: "libvndksupport.llndk",
native_bridge_supported: true,
symbol_file: "libvndksupport.map.txt",
export_include_dirs: ["include"],