diff options
| author | Martin Stjernholm <mast@google.com> | 2021-03-16 00:44:25 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2021-04-12 16:36:03 +0000 |
| commit | d3e9ff326a511ef48ea85afd2de9c292aa6ea20b (patch) | |
| tree | da924af40549dca5fb679173036049e70ca395e9 /compiler | |
| parent | 4531afd0d813fdfa2bb115522bc5918477c03dc2 (diff) | |
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
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/Android.bp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/Android.bp b/compiler/Android.bp index 935e255dac..b90b7e89c8 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp @@ -341,6 +341,10 @@ art_cc_library { apex_available: [ "com.android.art.debug", + // TODO(b/183882457): This lib doesn't go into com.android.art, but + // apex_available lists need to be the same for internal libs to avoid + // stubs, and this depends on libdexfiled. + "com.android.art", ], } |