Fix linking parameters.
Add libbase and liblog to the whole_static_libs so that anybody including
this will not need to also add these.
Test: Unit tests pass, built tests that required lib{base,log} before
Test: and verified they aren't needed after this change.
Change-Id: Ie3ba3c649a5cfc8a1c9b3ad25e8918146516651d
diff --git a/Android.bp b/Android.bp
index 5153fdd..b0f9456 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,8 +27,14 @@
"Test.cpp",
],
- static_libs: ["libbase", "liblog"],
- whole_static_libs: ["libgtest"],
+ // NOTE: libbase and liblog are re-exported by including them below.
+ // When Soong supports transitive static dependency includes, these
+ // libraries can be removed.
+ whole_static_libs: [
+ "libbase",
+ "libgtest",
+ "liblog",
+ ],
}
cc_library {
@@ -39,8 +45,9 @@
"Main.cpp",
],
- static_libs: ["libbase", "liblog"],
- whole_static_libs: ["libgtest_isolated"],
+ whole_static_libs: [
+ "libgtest_isolated",
+ ],
}
cc_test {