commit e1d9b28ae57649a7568e35ea7832b94b2bb4827f
author Arthur Eubanks <aeubanks@google.com> Wed Aug 16 17:12:33 2017 -0700
committer Andreas Gampe <agampe@google.com> Tue Oct 31 14:51:58 2017 -0700
tree c7074a1dc96b167fd91de3d1d830b62eefdfc573
parent 4f7be17266046b255dd65ea1d9e244b34e37c3ec

Change log libraries in tests to be statically linked

32-bit versions of the log libraries aren't flashed on the phone, so we
need to statically link them.

(cherry picked from commit d438af0a09866cdeeb9f4c0f17543a23be513998)

Test: build and run the 3 installd tests (32-bit and 64-bit)
Test: on walleye/bullhead
Merged-In: I06bea24c6c52ffdb34045449e0b40eb2ac146410
Change-Id: I06bea24c6c52ffdb34045449e0b40eb2ac146410

cmds/installd/tests/Android.bp

diff --git a/cmds/installd/tests/Android.bp b/cmds/installd/tests/Android.bp
index c6ebb24..89c11aa 100644
--- a/cmds/installd/tests/Android.bp
+++ b/cmds/installd/tests/Android.bp
@@ -6,13 +6,13 @@
     cflags: ["-Wall", "-Werror"],
     shared_libs: [
         "libbase",
-        "liblog",
         "libutils",
         "libcutils",
     ],
     static_libs: [
-        "libinstalld",
         "libdiskusage",
+        "libinstalld",
+        "liblog",
     ],
 }
 
@@ -25,14 +25,14 @@
         "libbase",
         "libbinder",
         "libcutils",
-        "liblog",
-        "liblogwrap",
         "libselinux",
         "libutils",
     ],
     static_libs: [
-        "libinstalld",
         "libdiskusage",
+        "libinstalld",
+        "liblog",
+        "liblogwrap",
     ],
 }
 
@@ -45,13 +45,13 @@
         "libbase",
         "libbinder",
         "libcutils",
-        "liblog",
-        "liblogwrap",
         "libselinux",
         "libutils",
     ],
     static_libs: [
-        "libinstalld",
         "libdiskusage",
+        "libinstalld",
+        "liblog",
+        "liblogwrap",
     ],
 }