commit 3274cc4692aa636471ad4ea0ae5f5e81d3552b14
author Martin Stjernholm <mast@google.com> Mon Nov 11 15:33:22 2019 +0000
committer Martin Stjernholm <mast@google.com> Thu Nov 21 16:15:20 2019 +0000
tree bdcffefcde2c3f65ae8ad5a3ea8710877a929615
parent 2a8bca749533dcefabff497d4f7346a35601a702

Reland "Add libdl_android to the Runtime (aka Bionic) APEX".

Before this it ended up in /system.

Test: build & boot
Test: adb shell find system apex -name libdl_android.so | xargs adb shell ls -l
  =>
  apex/com.android.runtime/lib/bionic/libdl_android.so
  apex/com.android.runtime/lib64/bionic/libdl_android.so
  apex/com.android.runtime@1/lib/bionic/libdl_android.so
  apex/com.android.runtime@1/lib64/bionic/libdl_android.so
  system/lib/bootstrap/libdl_android.so
  system/lib/libdl_android.so -> /apex/com.android.runtime/lib/bionic/libdl_android.so
  system/lib64/bootstrap/libdl_android.so
  system/lib64/libdl_android.so -> /apex/com.android.runtime/lib64/bionic/libdl_android.so
Test: atest CtsBionicTestCases
Test: Repro in b/144343305#comment8 together with ag/9754153
Bug: 135753770
Bug: 144343305
Change-Id: I9ccd10b711223ca474e91741711b7b8efd521b2d

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 276541e..4fbbec1 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -29,6 +29,7 @@
         "libc",
         "libm",
         "libdl",
+        "libdl_android",
         "libc_malloc_debug",
         "libc_malloc_hooks",
     ],