commit 7dc43bd7f1847b3cab04d676a658e4c975a73db8
author Nicolas Geoffray <ngeoffray@google.com> Wed Aug 05 16:02:26 2020 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Thu Aug 06 10:00:09 2020 +0100
tree 0b393c9e2b79c1d8865514da831a033398d5ed5c
parent 724d27147fe40db805d58a50da162579370ae34a

Update platform mainline SDK and add test export.

- Make liblog static and shared for host.
- Add test exports for libtombstoned_client needed for ART testing.

Test: m
Bug: 142935992
Change-Id: Ic8532f67faa3d301e5ee915c79020f7ad9a90525

Android.bp

diff --git a/Android.bp b/Android.bp
index 99b41b4..0451c2b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -68,11 +68,30 @@
     host_supported: true,
     native_shared_libs: [
         "libartpalette-system",
-        "liblog",
     ],
     target: {
         darwin: {
             enabled: false,
         },
+        android: {
+            native_shared_libs: [
+                "liblog",
+            ],
+        },
+        not_windows: {
+            native_libs: [
+                "liblog",
+            ],
+        }
     },
 }
+
+module_exports {
+    name: "platform-mainline-test-exports",
+    host_supported: false,
+    native_shared_libs: [
+        // Required by the implementation of libartpalette-system,
+        // which ART uses in replacement of stubs in its testing environment.
+        "libtombstoned_client",
+    ],
+}