commit b87c1e8705f8e3b29c32f4da74583c206019eff9
author David Sehr <sehr@google.com> Thu Feb 08 21:51:58 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 08 21:51:58 2018 +0000
tree cb290e2697aa399cab0239c23b5619d152f00865
parent f73f39d745580d93ffbc4b659298bb2a9928e329
parent 04b4eea4190b8c5047e86bb1808c3090c7ba8aca

Merge "Remove dependency on -no_art variant" am: 2ccde89153 am: 1f5228709c
am: 1f42401f35

Change-Id: I58e8ff0d06708d42ff2dbfe4cb85820dfb4c05d3

libunwindstack/DexFile.cpp

diff --git a/libunwindstack/DexFile.cpp b/libunwindstack/DexFile.cpp
index c2911df..b18b0ce 100644
--- a/libunwindstack/DexFile.cpp
+++ b/libunwindstack/DexFile.cpp
@@ -24,7 +24,7 @@
 
 #include <android-base/unique_fd.h>
 
-#include <dex/code_item_accessors-no_art-inl.h>
+#include <dex/code_item_accessors-inl.h>
 #include <dex/compact_dex_file.h>
 #include <dex/dex_file-inl.h>
 #include <dex/dex_file_loader.h>

libunwindstack/tests/DexFileTest.cpp

diff --git a/libunwindstack/tests/DexFileTest.cpp b/libunwindstack/tests/DexFileTest.cpp
index 6e05c5e..0b02c5b 100644
--- a/libunwindstack/tests/DexFileTest.cpp
+++ b/libunwindstack/tests/DexFileTest.cpp
@@ -25,7 +25,7 @@
 #include <unwindstack/MapInfo.h>
 #include <unwindstack/Memory.h>
 
-#include <dex/code_item_accessors-no_art-inl.h>
+#include <dex/code_item_accessors-inl.h>
 #include <dex/standard_dex_file.h>
 
 #include <gtest/gtest.h>