Merge libdexfile_external into libdexfile (reland 2).
To reduce the number of DSO's. libdexfile_external only adds a few
small functions on top of libdexfile, and it's still only those
functions that are available in the APEX stubs.
Also rename libdexfile_external_static to libdexfile_static, for
consistency.
Since libdexfile now has stubs, we need to add test_for properties to
avoid linking against the stubs in tests.
This relands https://r.android.com/1666119 that got submitted out of
order from https://r.android.com/1664026 - prerequisite changes now
submitted with https://r.android.com/1671709.
Test: Flash and boot with userdebug and eng to try both release and
debug modules.
Test: art/tools/buildbot-build.sh {--target,--host}
Test: art/build/apex/runtests.sh
Test: mmm art
Bug: 143978909
Change-Id: I6de99052d6d8a9d01d748baabbbcecfe1f4509dc
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 2e6bf1e..3e1f5be 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -111,6 +111,10 @@
# Remove symbols/apex/com.android.art symlink (b/171406631)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/apex/com.android.art)
+# art/tools/build_linux_bionic_tests.sh uses find here and can encounter
+# libdexfile_external.so in incremental builds.
+$(call add-clean-step, rm -rf $(HOST_OUT))
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************