commit aceab263cbd7b311dc712c38b694016fb367b6c0
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 06 11:03:41 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 06 11:03:41 2020 +0000
tree 07ad8c7c41f9abbb3afacb916345d5dec8527ffc
parent 5a69d654ada2f94844aae96fef2856e398c32801
parent 1dd87472d5e6d42c665cf55713f241f72bea8ac9

Merge "Add linkerconfig to the host exports." am: 7f65348eb0 am: 1dd87472d5

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1391220

Change-Id: I7e28a3e850142d6b8a1bec909ba993ebe87856ee

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index ce9d82b..100430d 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -65,10 +65,14 @@
 
 module_exports {
     name: "runtime-module-host-exports",
-    defaults: ["linux_bionic_supported"],
+    host_supported: true,
     device_supported: false,
+    compile_multilib: "64",
 
-    native_binaries: [
-        "linker",
-    ],
+    native_binaries: ["linkerconfig"],
+    target: {
+        linux_bionic: {
+            native_binaries: ["linker"],
+        },
+    },
 }