Link liblz4 and liblzma dynamically again.
This reverts https://r.android.com/821441 in spirit - it was an attempt
to avoid external shared lib dependencies before the APEX library
dependency logic was built. Now these shared libraries will simply be
added as internal libs in the APEX.
Soong doesn't propagate shared lib dependencies in static libs, so we
have to repeat them in some cases where libelffile and libart-dex2oat
are used.
Test: art/build/apex/runtests.sh
Test: art/tools/buildbot-build.sh
Bug: 118374951
Change-Id: I0a61b8388f12a749ab8ab5074866eebbad78548b
diff --git a/compiler/Android.bp b/compiler/Android.bp
index 8896c84..a0118ca 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -160,6 +160,7 @@
generated_sources: ["art_compiler_operator_srcs"],
shared_libs: [
"libbase",
+ "liblzma", // libelffile(d) dependency; must be repeated here since it's a static lib.
],
header_libs: [
"art_cmdlineparser_headers", // For compiler_options.