Revert "Stop-gap for buildbot and golem testing."
This reverts commit 39e95ec8e11bf165aafba91855224abc1e08fe5c.
Reason for revert: Temporary revert to diagnose golem issues.
Change-Id: Id1dc7d6258e2805089679ea63b62abeee6644a7f
diff --git a/Android.mk b/Android.mk
index e4cc5c0..a98bedc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -487,28 +487,14 @@
lib/bootstrap/libdl.so \
lib64/bootstrap/libc.so \
lib64/bootstrap/libm.so \
- lib64/bootstrap/libdl.so \
+ lib64/bootstrap/libdl.so
-PRIVATE_RUNTIME_DEPENDENCY_LIBS := \
- lib/libnativebridge.so \
- lib64/libnativebridge.so \
- lib/libnativehelper.so \
- lib64/libnativehelper.so \
- lib/libdexfile_external.so \
- lib64/libdexfile_external.so \
- lib/libnativeloader.so \
- lib64/libnativeloader.so \
-
-.PHONY: standalone-apex-files
-standalone-apex-files: libc.bootstrap libdl.bootstrap libm.bootstrap linker com.android.runtime.debug
+.PHONY: art-bionic-files
+art-bionic-files: libc.bootstrap libdl.bootstrap libm.bootstrap linker
for f in $(PRIVATE_BIONIC_FILES); do \
tf=$(TARGET_OUT)/$$f; \
if [ -f $$tf ]; then cp -f $$tf $$(echo $$tf | sed 's,bootstrap/,,'); fi; \
done
- for f in $(PRIVATE_RUNTIME_DEPENDENCY_LIBS); do \
- tf=$(TARGET_OUT)/../apex/com.android.runtime.debug/$$f; \
- if [ -f $$tf ]; then cp -f $$tf $(TARGET_OUT)/$$f; fi; \
- done
########################################################################
# Phony target for only building what go/lem requires for pushing ART on /data.
@@ -543,7 +529,7 @@
$(TARGET_CORE_IMG_OUT_BASE)-interpreter.art \
libc.bootstrap libdl.bootstrap libm.bootstrap \
icu-data-art-test \
- standalone-apex-files
+ art-bionic-files
# remove debug libraries from public.libraries.txt because golem builds
# won't have it.
sed -i '/libartd.so/d' $(TARGET_OUT)/etc/public.libraries.txt
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index e63e6f1..6be243a 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -77,7 +77,7 @@
make_command+=" debuggerd su"
make_command+=" libstdc++ "
make_command+=" ${ANDROID_PRODUCT_OUT#"${ANDROID_BUILD_TOP}/"}/system/etc/public.libraries.txt"
- make_command+=" standalone-apex-files"
+ make_command+=" art-bionic-files"
if [[ -n "$ART_TEST_CHROOT" ]]; then
# These targets are needed for the chroot environment.
make_command+=" crash_dump event-log-tags"
