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
diff --git a/cc/compiler.go b/cc/compiler.go
index 0ab1f01..fe46a3c 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -226,7 +226,8 @@
}
if compiler.hasSrcExt(".sysprop") {
- deps.SharedLibs = append(deps.SharedLibs, "libbase")
+ deps.HeaderLibs = append(deps.HeaderLibs, "libbase_headers")
+ deps.SharedLibs = append(deps.SharedLibs, "liblog")
}
if Bool(compiler.Properties.Openmp) {
diff --git a/cc/testing.go b/cc/testing.go
index b3b2756..2f41de1 100644
--- a/cc/testing.go
+++ b/cc/testing.go
@@ -70,16 +70,6 @@
}
cc_library {
- name: "libbase",
- no_libgcc: true,
- nocrt: true,
- vendor_available: true,
- vndk: {
- enabled: true,
- support_system_process: true,
- }
- }
- cc_library {
name: "libc",
no_libgcc: true,
nocrt: true,