Fix art script and golem builds with conscrypt.
1) When no bootclasspath is given to the art script, also add conscrypt to
the list.
2) Have build-art-target-golem deapex the prebuilt conscrypt apex.
Bug: 154074847
Test: build-art-target-golem
Change-Id: I648c23e05ad7d8f3387293c287fee3ba8380f1fb
diff --git a/Android.mk b/Android.mk
index 6e8673d..37e4a34 100644
--- a/Android.mk
+++ b/Android.mk
@@ -621,7 +621,8 @@
# TODO(b/129332183): Remove this when Golem has full support for the
# ART APEX.
.PHONY: standalone-apex-files
-standalone-apex-files: libc.bootstrap \
+standalone-apex-files: deapexer \
+ libc.bootstrap \
libdl.bootstrap \
libdl_android.bootstrap \
libm.bootstrap \
@@ -646,6 +647,14 @@
cp -fd $$tf $$df; \
fi; \
done; \
+ conscrypt_dir="$$apex_orig_dir/$(CONSCRYPT_APEX)"; \
+ conscrypt_apex="$$apex_orig_dir/$(CONSCRYPT_APEX).apex"; \
+ if [ -f $$conscrypt_apex ]; then \
+ rm -rf $$conscrypt_dir; \
+ mkdir $$conscrypt_dir; \
+ debugfs=$(HOST_OUT)/bin/debugfs_static; \
+ $(HOST_OUT)/bin/deapexer --debugfs_path $$debugfs extract $$conscrypt_apex $$conscrypt_dir; \
+ fi; \
conscrypt_apex_orig_dir=$$apex_orig_dir/$(CONSCRYPT_APEX); \
for f in $(PRIVATE_CONSCRYPT_APEX_DEPENDENCY_LIBS); do \
tf="$$conscrypt_apex_orig_dir/$$f"; \