diff options
| author | 2017-10-18 13:15:02 -0700 | |
|---|---|---|
| committer | 2017-10-18 13:27:12 -0700 | |
| commit | 2b51edd7918d6a70fd335cdc5af50e9513aab1cf (patch) | |
| tree | e2e57953d38318df3b7d32ca707fa07093fb16d7 | |
| parent | d6947136eab2fcefb1a9195110b9195aabaf469e (diff) | |
ART: Fix includes
Add missing libnativehelper dependencies. Remove superfluous
ScopedLocalRef includes.
Test: mmma art
Change-Id: Ic2ecbcc1d205500307f0ef5b2859c60d3fc336f3
| -rw-r--r-- | compiler/Android.bp | 2 | ||||
| -rw-r--r-- | dex2oat/dex2oat.cc | 1 | ||||
| -rw-r--r-- | oatdump/oatdump.cc | 1 | ||||
| -rw-r--r-- | runtime/Android.bp | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/compiler/Android.bp b/compiler/Android.bp index 1e4cdf2bd5..c2984e1743 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp @@ -191,6 +191,7 @@ art_cc_defaults { shared_libs: [ "libbase", "liblzma", + "libnativehelper", ], include_dirs: ["art/disassembler"], header_libs: [ @@ -415,6 +416,7 @@ art_cc_test { "libvixld-arm64", "libbacktrace", + "libnativehelper", "libnativeloader", ], diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index c41e9da932..3abf36f326 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -84,7 +84,6 @@ #include "mirror/class_loader.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" -#include "nativehelper/ScopedLocalRef.h" #include "oat_file.h" #include "oat_file_assistant.h" #include "os.h" diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc index bdc36e8e19..7064fa3a9b 100644 --- a/oatdump/oatdump.cc +++ b/oatdump/oatdump.cc @@ -58,7 +58,6 @@ #include "mirror/dex_cache-inl.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" -#include "nativehelper/ScopedLocalRef.h" #include "oat.h" #include "oat_file-inl.h" #include "oat_file_manager.h" diff --git a/runtime/Android.bp b/runtime/Android.bp index ddfbed4499..e7622f2a58 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -509,6 +509,7 @@ art_cc_library { "libartd", "libbase", "libbacktrace", + "libnativehelper", ], } |