Move the file which defines DWARF enums.
It was previously part of the runtime since it was needed
by the linker. This is no longer the case so we can move
it to the DWARF utility library.
Change-Id: I1874fad45d27fd9ebbae17dd82d43322190f91ef
diff --git a/compiler/dwarf/debug_frame_opcode_writer.h b/compiler/dwarf/debug_frame_opcode_writer.h
index d0d1821..4112c84 100644
--- a/compiler/dwarf/debug_frame_opcode_writer.h
+++ b/compiler/dwarf/debug_frame_opcode_writer.h
@@ -17,9 +17,9 @@
#ifndef ART_COMPILER_DWARF_DEBUG_FRAME_OPCODE_WRITER_H_
#define ART_COMPILER_DWARF_DEBUG_FRAME_OPCODE_WRITER_H_
-#include "dwarf.h"
-#include "register.h"
-#include "writer.h"
+#include "dwarf/dwarf_constants.h"
+#include "dwarf/register.h"
+#include "dwarf/writer.h"
#include "utils.h"
namespace art {
diff --git a/compiler/dwarf/debug_info_entry_writer.h b/compiler/dwarf/debug_info_entry_writer.h
index a2c9f5f..f5b9ca5 100644
--- a/compiler/dwarf/debug_info_entry_writer.h
+++ b/compiler/dwarf/debug_info_entry_writer.h
@@ -20,9 +20,9 @@
#include <cstdint>
#include <unordered_map>
-#include "dwarf.h"
+#include "dwarf/dwarf_constants.h"
+#include "dwarf/writer.h"
#include "leb128.h"
-#include "writer.h"
namespace art {
namespace dwarf {
diff --git a/compiler/dwarf/debug_line_opcode_writer.h b/compiler/dwarf/debug_line_opcode_writer.h
index 77ed154..bdc25e4 100644
--- a/compiler/dwarf/debug_line_opcode_writer.h
+++ b/compiler/dwarf/debug_line_opcode_writer.h
@@ -19,8 +19,8 @@
#include <cstdint>
-#include "dwarf.h"
-#include "writer.h"
+#include "dwarf/dwarf_constants.h"
+#include "dwarf/writer.h"
namespace art {
namespace dwarf {
diff --git a/runtime/dwarf.h b/compiler/dwarf/dwarf_constants.h
similarity index 98%
rename from runtime/dwarf.h
rename to compiler/dwarf/dwarf_constants.h
index b491f47..8e39ca7 100644
--- a/runtime/dwarf.h
+++ b/compiler/dwarf/dwarf_constants.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_RUNTIME_DWARF_H_
-#define ART_RUNTIME_DWARF_H_
+#ifndef ART_COMPILER_DWARF_DWARF_CONSTANTS_H_
+#define ART_COMPILER_DWARF_DWARF_CONSTANTS_H_
namespace art {
namespace dwarf {
@@ -661,4 +661,4 @@
} // namespace dwarf
} // namespace art
-#endif // ART_RUNTIME_DWARF_H_
+#endif // ART_COMPILER_DWARF_DWARF_CONSTANTS_H_
diff --git a/compiler/dwarf/headers.h b/compiler/dwarf/headers.h
index d17d327..760f53c 100644
--- a/compiler/dwarf/headers.h
+++ b/compiler/dwarf/headers.h
@@ -19,11 +19,11 @@
#include <cstdint>
-#include "debug_frame_opcode_writer.h"
-#include "debug_info_entry_writer.h"
-#include "debug_line_opcode_writer.h"
-#include "register.h"
-#include "writer.h"
+#include "dwarf/debug_frame_opcode_writer.h"
+#include "dwarf/debug_info_entry_writer.h"
+#include "dwarf/debug_line_opcode_writer.h"
+#include "dwarf/register.h"
+#include "dwarf/writer.h"
namespace art {
namespace dwarf {