Remove obsolete llndk_library
Remove llndk_library in favor of cc_library with llndk.symbol_file.
Bug: 170784825
Test: m checkbuild
Test: TestLlndkLibrary
Change-Id: I43580976589a7a2a176d7442be53fa043c0c8324
diff --git a/cc/testing.go b/cc/testing.go
index bf89f62..ca6a0fa 100644
--- a/cc/testing.go
+++ b/cc/testing.go
@@ -27,7 +27,6 @@
RegisterLibraryHeadersBuildComponents(ctx)
ctx.RegisterModuleType("toolchain_library", ToolchainLibraryFactory)
- ctx.RegisterModuleType("llndk_library", LlndkLibraryFactory)
ctx.RegisterModuleType("cc_benchmark", BenchmarkFactory)
ctx.RegisterModuleType("cc_object", ObjectFactory)
ctx.RegisterModuleType("cc_genrule", genRuleFactory)
@@ -200,12 +199,9 @@
stubs: {
versions: ["27", "28", "29"],
},
- llndk_stubs: "libc.llndk",
- }
- llndk_library {
- name: "libc.llndk",
- symbol_file: "",
- sdk_version: "current",
+ llndk: {
+ symbol_file: "libc.map.txt",
+ },
}
cc_library {
name: "libm",
@@ -222,12 +218,9 @@
"//apex_available:platform",
"myapex"
],
- llndk_stubs: "libm.llndk",
- }
- llndk_library {
- name: "libm.llndk",
- symbol_file: "",
- sdk_version: "current",
+ llndk: {
+ symbol_file: "libm.map.txt",
+ },
}
// Coverage libraries
@@ -289,12 +282,9 @@
"//apex_available:platform",
"myapex"
],
- llndk_stubs: "libdl.llndk",
- }
- llndk_library {
- name: "libdl.llndk",
- symbol_file: "",
- sdk_version: "current",
+ llndk: {
+ symbol_file: "libdl.map.txt",
+ },
}
cc_library {
name: "libft2",
@@ -302,13 +292,10 @@
nocrt: true,
system_shared_libs: [],
recovery_available: true,
- llndk_stubs: "libft2.llndk",
- }
- llndk_library {
- name: "libft2.llndk",
- symbol_file: "",
- private: true,
- sdk_version: "current",
+ llndk: {
+ symbol_file: "libft2.map.txt",
+ private: true,
+ }
}
cc_library {
name: "libc++_static",