diff options
| author | David Sehr <sehr@google.com> | 2018-01-30 18:48:51 +0000 |
|---|---|---|
| committer | David Sehr <sehr@google.com> | 2018-01-30 18:48:51 +0000 |
| commit | 787784f9effb126b5d0d3dc97d544c4a477b5daf (patch) | |
| tree | 1ff6d9fd284a4dd2a337165dff20e71137997c9d /dexdump | |
| parent | b40b7e73469339a6b667b4a2e2b8690112a74dc9 (diff) | |
| download | art-787784f9effb126b5d0d3dc97d544c4a477b5daf.tar.gz art-787784f9effb126b5d0d3dc97d544c4a477b5daf.tar.bz2 art-787784f9effb126b5d0d3dc97d544c4a477b5daf.zip | |
Revert "Make libdexfile build independent of runtime dir"
This reverts commit b40b7e73469339a6b667b4a2e2b8690112a74dc9.
Reason for revert: on device libdexfile.so missing
Change-Id: I9bd61a98bef870400580e8c991cb061d3f57fa72
Diffstat (limited to 'dexdump')
| -rw-r--r-- | dexdump/Android.bp | 1 | ||||
| -rw-r--r-- | dexdump/dexdump.cc | 2 | ||||
| -rw-r--r-- | dexdump/dexdump_cfg.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/dexdump/Android.bp b/dexdump/Android.bp index f6b7a6b68a..eca08448bc 100644 --- a/dexdump/Android.bp +++ b/dexdump/Android.bp @@ -45,6 +45,7 @@ art_cc_binary { host_supported: true, device_supported: false, static_libs: [ + "libdexfile", "libbase", ] + art_static_dependencies, target: { diff --git a/dexdump/dexdump.cc b/dexdump/dexdump.cc index 01b28b55cf..24f41aba2e 100644 --- a/dexdump/dexdump.cc +++ b/dexdump/dexdump.cc @@ -50,7 +50,7 @@ #include "android-base/logging.h" #include "android-base/stringprintf.h" -#include "dex/code_item_accessors-inl.h" +#include "dex/code_item_accessors-no_art-inl.h" #include "dex/dex_file-inl.h" #include "dex/dex_file_exception_helpers.h" #include "dex/dex_file_loader.h" diff --git a/dexdump/dexdump_cfg.cc b/dexdump/dexdump_cfg.cc index 69ee0682a3..0e313572bc 100644 --- a/dexdump/dexdump_cfg.cc +++ b/dexdump/dexdump_cfg.cc @@ -25,7 +25,7 @@ #include <set> #include <sstream> -#include "dex/code_item_accessors-inl.h" +#include "dex/code_item_accessors-no_art-inl.h" #include "dex/dex_file-inl.h" #include "dex/dex_file_exception_helpers.h" #include "dex/dex_instruction-inl.h" |