commit 40890c1443e1e1d84058fe986aafc1ca2e81181d
author Roland Levillain <rpl@google.com> Sun Jan 13 22:48:38 2019 +0000
committer Roland Levillain <rpl@google.com> Sun Jan 13 22:48:38 2019 +0000
tree 9d38bab822dbd98a39916515445604d3455d8dd5
parent d585e61864370408cedae12621f6d2f1d0f67588

Have Golem build bootstrap Bionic libraries on target.

Have Golem target build rule (`build-art-target-golem`) build target
bootstrap Bionic libraries (libc, libdl, libm), so that they can be
found by the linker (in `/system/lib(64)`) even if the Runtime APEX is
not available.

This is a temporary change needed until Golem fully supports the
Runtime APEX.

Test: Rely on the ART Buildbot.
Bug: 121117762
Bug: 120266448
Bug: 113373927
Change-Id: Ied2e6ae8d073f45c9f635c96e1823b094c334991

Android.mk

diff --git a/Android.mk b/Android.mk
index 54c96ab..1a5daff 100644
--- a/Android.mk
+++ b/Android.mk
@@ -489,12 +489,19 @@
 # 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 Runtime APEX. This is a temporary change needed until Golem
+# fully supports the Runtime APEX.
+# TODO(b/121117762): Remove this when the ART Buildbot and Golem have
+# full support for the Runtime APEX.
+#
 # Also include a copy of the ICU .dat prebuilt files in
 # /system/etc/icu on target (see module `icu-data-art-test`), 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 device. This is a temporary change needed until both
-# the ART Buildbot and Golem fully support the Runtime APEX.
+# "/system" on device. This is a temporary change needed until Golem
+# fully supports the Runtime APEX.
 # TODO(b/121117762): Remove this when the ART Buildbot and Golem have
 # full support for the Runtime APEX.
 ART_TARGET_SHARED_LIBRARY_BENCHMARK := $(TARGET_OUT_SHARED_LIBRARIES)/libartbenchmark.so
@@ -506,6 +513,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 \
                         icu-data-art-test
 	# remove debug libraries from public.libraries.txt because golem builds
 	# won't have it.