diff options
| author | 2021-03-16 00:44:25 +0000 | |
|---|---|---|
| committer | 2021-04-12 16:36:03 +0000 | |
| commit | d3e9ff326a511ef48ea85afd2de9c292aa6ea20b (patch) | |
| tree | da924af40549dca5fb679173036049e70ca395e9 /libdexfile/external/dex_file_ext.cc | |
| 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 'libdexfile/external/dex_file_ext.cc')
| -rw-r--r-- | libdexfile/external/dex_file_ext.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libdexfile/external/dex_file_ext.cc b/libdexfile/external/dex_file_ext.cc index 4432f6a5d0..302e18800f 100644 --- a/libdexfile/external/dex_file_ext.cc +++ b/libdexfile/external/dex_file_ext.cc @@ -18,7 +18,6 @@ #include <inttypes.h> #include <stdint.h> -#include <sys/mman.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> @@ -43,6 +42,7 @@ #include <dex/dex_file_loader.h> extern "C" { + // Wraps DexFile to add the caching needed by the external interface. This is // what gets passed over as ExtDexFile*. struct ExtDexFile { |