cc_test_library now creates shared libraries too

Make these compile as static libraries by properly declaring their
dependencies.

I turned off the shared version of libBionicTests because it produces
this linker warning (treated as error):

external/libcxx/include/sstream:859: warning: relocation refers to
discarded section

Change-Id: I2e1448b47a441b273d208ebd068d0d22e340a0ff

diff --git a/tests/Android.bp b/tests/Android.bp
index 0be0f4c..0bbe4e3 100644 (file)
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -145,7 +145,11 @@ cc_test_library {
         "external/tinyxml2",
     ],
 
-    static_libs: ["libbase"],
+    static_libs: [
+        "libtinyxml2",
+        "liblog",
+        "libbase",
+    ],
     host_ldlibs: ["-lrt"],
 }
 
@@ -220,6 +224,9 @@ cc_test_library {
         "libfortify1-tests-clang",
         "libfortify2-tests-clang",
     ],
+    shared: {
+        enabled: false,
+    }
 }
 
 // -----------------------------------------------------------------------------