commit 0225f8e2939a9340cb7dcebfcfe7996a2bd9bce9
author David Sehr <sehr@google.com> Wed Jan 31 08:52:24 2018 +0000
committer David Sehr <sehr@google.com> Wed Jan 31 01:24:53 2018 -0800
tree fd32362dff4ecdc8ff8b0d800a1b46fb0d9d0104
parent c7e546ff3963a1d51b1f100d308db735bd19f736

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

runtime/oat_file.cc

diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc
index 307f7b9..dc4bae3 100644
--- a/runtime/oat_file.cc
+++ b/runtime/oat_file.cc
@@ -47,6 +47,7 @@
 #include "dex/dex_file_loader.h"
 #include "dex/dex_file_types.h"
 #include "dex/standard_dex_file.h"
+#include "dex/utf-inl.h"
 #include "elf_file.h"
 #include "elf_utils.h"
 #include "gc_root.h"
@@ -60,7 +61,6 @@
 #include "os.h"
 #include "runtime.h"
 #include "type_lookup_table.h"
-#include "utf-inl.h"
 #include "utils.h"
 #include "vdex_file.h"