diff options
| author | David Sehr <sehr@google.com> | 2018-01-31 08:52:24 +0000 |
|---|---|---|
| committer | David Sehr <sehr@google.com> | 2018-01-31 01:24:53 -0800 |
| commit | 0225f8e2939a9340cb7dcebfcfe7996a2bd9bce9 (patch) | |
| tree | fd32362dff4ecdc8ff8b0d800a1b46fb0d9d0104 /dexdump | |
| parent | c7e546ff3963a1d51b1f100d308db735bd19f736 (diff) | |
| download | art-0225f8e2939a9340cb7dcebfcfe7996a2bd9bce9.tar.gz art-0225f8e2939a9340cb7dcebfcfe7996a2bd9bce9.tar.bz2 art-0225f8e2939a9340cb7dcebfcfe7996a2bd9bce9.zip | |
Revert "Revert "Make libdexfile build independent of runtime dir""
This reverts commit 787784f9effb126b5d0d3dc97d544c4a477b5daf.
Reason for revert: Bot configuration issue.
Change-Id: I6a10bb4a9571f89c7e4dd095f9157e830a44e2de
Bug: 22322814
Test: make -j 50 checkbuild
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, 2 insertions, 3 deletions
diff --git a/dexdump/Android.bp b/dexdump/Android.bp index eca08448bc..f6b7a6b68a 100644 --- a/dexdump/Android.bp +++ b/dexdump/Android.bp @@ -45,7 +45,6 @@ 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 24f41aba2e..01b28b55cf 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-no_art-inl.h" +#include "dex/code_item_accessors-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 0e313572bc..69ee0682a3 100644 --- a/dexdump/dexdump_cfg.cc +++ b/dexdump/dexdump_cfg.cc @@ -25,7 +25,7 @@ #include <set> #include <sstream> -#include "dex/code_item_accessors-no_art-inl.h" +#include "dex/code_item_accessors-inl.h" #include "dex/dex_file-inl.h" #include "dex/dex_file_exception_helpers.h" #include "dex/dex_instruction-inl.h" |