aboutsummaryrefslogtreecommitdiffstats
path: root/sysprop
diff options
context:
space:
mode:
authorInseob Kim <inseob@google.com>2019-03-27 17:20:37 +0900
committerInseob Kim <inseob@google.com>2019-03-27 17:27:05 +0900
commit1f959769f344182a6741ddcebc7c592d6e521e7e (patch)
treecab9683b30d71784c80b7ae0a9eac44c29d62489 /sysprop
parent7446606eeb9994fabc62201031d604081c7c3aac (diff)
downloadbuild_soong-1f959769f344182a6741ddcebc7c592d6e521e7e.tar.gz
build_soong-1f959769f344182a6741ddcebc7c592d6e521e7e.tar.bz2
build_soong-1f959769f344182a6741ddcebc7c592d6e521e7e.zip
Remove libbase dependency of sysprop_library
libbase dependency is not really needed, but it has been causing build failure while linking with static variant of sysprop_library. This cuts the dependency and only depend on libbase_headers and liblog. Bug: 129301987 Test: 1) flash and boot walleye Test: 2) try to build various properties with sysprop_library. Test: 3) sysprop_test Change-Id: I027e01c754b782818f52103184301267d4cdd576
Diffstat (limited to 'sysprop')
-rw-r--r--sysprop/sysprop_test.go20
1 files changed, 20 insertions, 0 deletions
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go
index 79b0f4e8..a7aff59e 100644
--- a/sysprop/sysprop_test.go
+++ b/sysprop/sysprop_test.go
@@ -73,6 +73,7 @@ func testContext(config android.Config, bp string,
})
ctx.RegisterModuleType("cc_library", android.ModuleFactoryAdaptor(cc.LibraryFactory))
+ ctx.RegisterModuleType("cc_library_headers", android.ModuleFactoryAdaptor(cc.LibraryHeaderFactory))
ctx.RegisterModuleType("cc_library_static", android.ModuleFactoryAdaptor(cc.LibraryFactory))
ctx.RegisterModuleType("cc_object", android.ModuleFactoryAdaptor(cc.ObjectFactory))
ctx.RegisterModuleType("llndk_library", android.ModuleFactoryAdaptor(cc.LlndkLibraryFactory))
@@ -271,6 +272,25 @@ func TestSyspropLibrary(t *testing.T) {
soc_specific: true,
static_libs: ["sysprop-platform", "sysprop-vendor"],
}
+
+ cc_library_headers {
+ name: "libbase_headers",
+ vendor_available: true,
+ recovery_available: true,
+ }
+
+ cc_library {
+ name: "liblog",
+ no_libgcc: true,
+ nocrt: true,
+ system_shared_libs: [],
+ recovery_available: true,
+ }
+
+ llndk_library {
+ name: "liblog",
+ symbol_file: "",
+ }
`)
for _, variant := range []string{