diff options
author | 2024-10-01 03:10:44 +0100 | |
---|---|---|
committer | 2024-10-03 20:13:55 +0100 | |
commit | d6ce14941e1d861b86f6326059abe7ed4d19eaa0 (patch) | |
tree | 78bf415ae24a1f567e44fc41f8ba311060d8248b /build | |
parent | 6cb63acdff440bb7573091e05d64b09cf0afda7c (diff) |
Add libandroidio to all APEXes.
Before this, libandroidio wasn't present in
test_broken_com.android.art, but in all other APEXes. When building
libs that depend on it, like libjavacore, Soong needs to decide whether
to build against libandroidio stubs or bypass them. If all APEXes they
are included in also have the libandroidio implementation lib it can
bypass the stubs, but if _any_ APEX doesn't, then the build has to
switch to stubs. There's only one variant for all APEXes, so
libjavacore ends up being built against stubs in all of them.
Thus, since test_broken_com.android.art had libjavacore but not
libandroidio, libjavacore in all APEXes got built against stubs. This
adds libandroidio (among other libcore native libs) to
test_broken_com.android.art, to change that.
The build difference is probably not significant, but this allows the
refactorings in the child CLs to verify that the .apex files are kept
bitwise identical.
#codehealth
Test: art/build/apex/runtests.sh
Test: lunch armv8
m test_broken_com.android.art test_jitzygote_com.android.art \
test_imgdiag_com.android.art com.android.art \
com.android.art.debug com.android.art.testing
Check that test_broken_com.android.art changes as expected, and that
only libjavacore.so is different in the other APEXes.
Change-Id: I0e9636277b5dd22f1ead577490b03d41925b4889
Diffstat (limited to 'build')
-rw-r--r-- | build/apex/Android.bp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/apex/Android.bp b/build/apex/Android.bp index 8de902bb45..ca66c3bef2 100644 --- a/build/apex/Android.bp +++ b/build/apex/Android.bp @@ -262,7 +262,7 @@ apex_test { // unwanted_transitive_deps we can ensure `libart` gets excluded // anyway. // TODO(mast): Add back the binaries and clean this up. - native_shared_libs: art_runtime_base_broken_native_shared_libs + ["libopenjdkjvm"], + native_shared_libs: art_runtime_base_broken_native_shared_libs + libcore_native_shared_libs, unwanted_transitive_deps: ["libart"], compile_multilib: "both", |