commit 102d5e87144dca7787441e08f617c9bee7a241d5
author Nicolas Geoffray <ngeoffray@google.com> Thu Aug 06 16:52:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 06 16:52:05 2020 +0000
tree 331c46c167c90faf0a16ba6c6e93e5f0e6d93d68
parent 2576f14ca9bc14b93414614109d08e633f752759
parent 9a023e9ccd5fd325be756e94e8678225002dd8f8

Merge "Update platform mainline SDK and add test export." am: 6079ce8956 am: 620d93566b am: 1f947f6d25 am: 9a023e9ccd

Original change: https://android-review.googlesource.com/c/platform/system/libartpalette/+/1391376

Change-Id: Ic515233399dcb22b2a19ce1c6820c2245c316033

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",
+    ],
+}