tree 413aa4746ef3a6cbcbdbf8d75387e85be87f6460
parent a191bbfd53a0c7df9b5639bfbefeb8b531c833db
author Martin Stjernholm <mast@google.com> 1615855465 +0000
committer Martin Stjernholm <mast@google.com> 1617959910 +0000

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