Merge "Have Golem build bootstrap Bionic libraries on target."
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index d4888f9..755104b 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -83,6 +83,14 @@
fi
# Build the Debug Runtime APEX (which is a superset of the Release Runtime APEX).
make_command+=" com.android.runtime.debug"
+ # Build the bootstrap Bionic libraries (libc, libdl, libm). These are required
+ # as the "main" libc, libdl, and libm have moved to the Runtime APEX. This is
+ # a temporary change needed until both the ART Buildbot and Golem fully
+ # support the Runtime APEX.
+ #
+ # TODO(b/121117762): Remove this when the ART Buildbot and Golem have full
+ # support for the Runtime APEX.
+ make_command+=" libc.bootstrap libdl.bootstrap libm.bootstrap"
# Create a copy of the ICU .dat prebuilt files in /system/etc/icu on target,
# so that it can found even if the Runtime APEX is not available, by setting
# the environment variable `ART_TEST_ANDROID_RUNTIME_ROOT` to "/system" on
