Remove dependencies on stubs from build-art-target-golem.
On master-art these libraries were provided by prebuilt stubs, which no
longer got install rules after https://r.android.com/1974259 so the
build broke.
The stubs got replaced with the implementation libraries that are
extracted from the APEXes by the standalone-apex-files rule, so this
does not affect the build.
Test: env SOONG_ALLOW_MISSING_DEPENDENCIES=true \
TARGET_BUILD_UNBUNDLED=true ART_BUILD_TARGET_DEBUG=false \
ART_BUILD_HOST_DEBUG=false USE_DEX2OAT_DEBUG=false \
WITH_DEX_PREOPT_GENERATE_PROFILE=false OUT_DIR=out/x86_64 \
ART_TARGET_LINUX=true ART_USE_READ_BARRIER=true \
CUSTOM_TARGET_LINKER=out/x86_64/target/product/arm_krait/system/bin/linker \
m build-art-target-golem
tar -cz -f linux-armv7.tar.gz --exclude .git --exclude \
.gitignore -- out/x86_64/target/product/arm_krait/manifest.xml \
out/x86_64/target/product/arm_krait/apex \
out/x86_64/target/product/arm_krait/system
Check that linux-armv7.tar.gz contains the same libraries as one from
the last successful Golem build (ART build 18095 on go/lem).
Bug: 224971494
Bug: 129332183
Change-Id: I3fd4deef1f7c80984cb9289d4aa2305928fef5ca
diff --git a/Android.mk b/Android.mk
index dc5b0c8..93c1fef 100644
--- a/Android.mk
+++ b/Android.mk
@@ -687,13 +687,8 @@
.PHONY: build-art-target-golem
-# TODO(b/129332183): Clean this up when Golem runs can mount the APEXes directly
-# in the chroot.
-
ART_TARGET_PLATFORM_DEPENDENCIES := \
$(TARGET_OUT)/etc/public.libraries.txt \
- $(TARGET_OUT_SHARED_LIBRARIES)/heapprofd_client_api.so \
- $(TARGET_OUT_SHARED_LIBRARIES)/libartpalette-system.so \
$(TARGET_OUT_SHARED_LIBRARIES)/libcutils.so \
$(TARGET_OUT_SHARED_LIBRARIES)/liblz4.so \
$(TARGET_OUT_SHARED_LIBRARIES)/libprocessgroup.so \