Update Buildbot and Golem setups for libdl_android.so.
Test: art/tools/run-gtests.sh /apex/com.android.art/bin/art/arm/arch_test (in chroot)
Bug: 135753770
Bug: 144343305
Change-Id: I19f359602d7194ccabd46e55665f3ff1a897013f
diff --git a/Android.mk b/Android.mk
index 6de27ae..cc68a8b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -574,7 +574,7 @@
# TODO(b/129332183): Remove this when Golem has full support for the
# ART APEX.
.PHONY: standalone-apex-files
-standalone-apex-files: libc.bootstrap libdl.bootstrap libm.bootstrap linker $(DEBUG_ART_APEX)
+standalone-apex-files: libc.bootstrap libdl.bootstrap libdl_android.bootstrap libm.bootstrap linker $(DEBUG_ART_APEX)
for f in $(PRIVATE_BIONIC_FILES); do \
tf=$(TARGET_OUT)/$$f; \
if [ -f $$tf ]; then cp -f $$tf $$(echo $$tf | sed 's,bootstrap/,,'); fi; \
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index 240eaa6..fb171a4 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -94,7 +94,7 @@
# These targets create these symlinks:
# - from /system/bin/linker(64) to /apex/com.android.runtime/bin/linker(64); and
# - from /system/lib(64)/$lib to /apex/com.android.runtime/lib(64)/$lib.
- make_command+=" linker libc.bootstrap libdl.bootstrap libm.bootstrap"
+ make_command+=" linker libc.bootstrap libdl.bootstrap libdl_android.bootstrap libm.bootstrap"
# Build the i18n APEX.
make_command+=" com.android.i18n"
# Build the Time Zone Data APEX.
