Move liblog from static to shared.

am: aedc8f752a

Change-Id: Ice06254dabeee5daa80bc2df5c0489386aa3f825

1 files changed, 20 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index b0f9456..ad762c2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_library {
+cc_library_static {
     name: "libgtest_isolated",
     host_supported: true,
     cflags: ["-Wall", "-Werror"],
@@ -27,17 +27,22 @@ cc_library {
         "Test.cpp",
     ],
 
-    // NOTE: libbase and liblog are re-exported by including them below.
-    // When Soong supports transitive static dependency includes, these
-    // libraries can be removed.
+    // NOTE: libbase is re-exported by including them below.
+    // When Soong supports transitive static dependency includes, this
+    // library can be removed.
     whole_static_libs: [
         "libbase",
         "libgtest",
+    ],
+
+    // Add liblog as a shared library so that gtests can override liblog
+    // functions without getting duplicate symbols.
+    shared_libs: [
         "liblog",
     ],
 }
 
-cc_library {
+cc_library_static {
     name: "libgtest_isolated_main",
     host_supported: true,
     cflags: ["-Wall", "-Werror"],
@@ -48,6 +53,12 @@ cc_library {
     whole_static_libs: [
         "libgtest_isolated",
     ],
+
+    // Add liblog as a shared library so that gtests can override liblog
+    // functions without getting duplicate symbols.
+    shared_libs: [
+        "liblog",
+    ],
 }
 
 cc_test {
@@ -59,6 +70,9 @@ cc_test {
     ],
     cflags: ["-Wall", "-Werror"],
 
-    shared_libs: ["libbase"],
+    shared_libs: [
+        "libbase",
+        "liblog",
+    ],
     whole_static_libs: ["libgtest_isolated_main"],
 }