diff options
| author | Martin Stjernholm <mast@google.com> | 2021-03-16 00:44:25 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2021-04-09 09:18:30 +0000 |
| commit | 14d9155cc5ac661961aa6718eaf2bfcc704d3c98 (patch) | |
| tree | 413aa4746ef3a6cbcbdbf8d75387e85be87f6460 /compiler | |
| parent | a191bbfd53a0c7df9b5639bfbefeb8b531c833db (diff) | |
Merge libdexfile_external into libdexfile (reland).
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/1643424 with leaving out
dex_file_ext.cc on Windows (cf. build issue b/184239856): mapped_file.h
brings in windows.h in Windows builds, which has several defines that
are incompatible with dex internals (e.g. CONST).
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
Test: m TARGET_PRODUCT=full TARGET_BUILD_VARIANT=eng checkbuild
Bug: 143978909
Change-Id: I582e49ae797744837849db056cef2fbeacc0681e
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", ], } |