Add libdl_android.so to more places required for Golem. am: 80f1c2850a am: f6ad6c11bc
am: 5db702fded
Change-Id: I89d63760b1158b39a0df4640579c3f30237ec2dc
diff --git a/Android.mk b/Android.mk
index cc68a8b..4e21ec8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -531,9 +531,11 @@
lib/bootstrap/libc.so \
lib/bootstrap/libm.so \
lib/bootstrap/libdl.so \
+ lib/bootstrap/libdl_android.so \
lib64/bootstrap/libc.so \
lib64/bootstrap/libm.so \
lib64/bootstrap/libdl.so \
+ lib64/bootstrap/libdl_android.so \
PRIVATE_ART_APEX_DEPENDENCY_LIBS := \
lib/libnativebridge.so \
@@ -596,9 +598,9 @@
# Also include libartbenchmark, we always include it when running golem.
# libstdc++ is needed when building for ART_TARGET_LINUX.
-# Also include the bootstrap Bionic libraries (libc, libdl, libm).
-# These are required as the "main" libc, libdl, and libm have moved to
-# the ART APEX. This is a temporary change needed until Golem
+# Also include the bootstrap Bionic libraries (libc, libdl, libdl_android,
+# libm). These are required as the "main" libc, libdl, libdl_android, and libm
+# have moved to the ART APEX. This is a temporary change needed until Golem
# fully supports the ART APEX.
#
# TODO(b/129332183): Remove this when Golem has full support for the
@@ -637,7 +639,7 @@
$(ART_TARGET_SHARED_LIBRARY_BENCHMARK) \
$(TARGET_CORE_IMG_OUT_BASE).art \
$(TARGET_CORE_IMG_OUT_BASE)-interpreter.art \
- libc.bootstrap libdl.bootstrap libm.bootstrap \
+ libc.bootstrap libdl.bootstrap libdl_android.bootstrap libm.bootstrap \
icu-data-art-test-i18n \
tzdata-art-test-tzdata tzlookup.xml-art-test-tzdata \
tz_version-art-test-tzdata icu_overlay-art-test-tzdata \
