Move RelativePatcher from libart-compiler.so to dex2oat.
For AOSP master, aosp_taimen-userdebug:
- before:
/system/lib/libart-compiler.so: 2084640
/system/lib64/libart-compiler.so: 2921496
/bin/dex2oat: 528372
- after:
/system/lib/libart-compiler.so: 2059264 (-24.8KiB)
/system/lib64/libart-compiler.so: 2920856 (-640B)
/bin/dex2oat: 550056 (+21.2KiB)
Test: m
Test: m test-art-host-gtest
Bug: 77951326
Change-Id: I8687ab9e00049acc46a6d229e5121b36d5379737
diff --git a/compiler/Android.bp b/compiler/Android.bp
index 6bed48e..cde64b0 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -39,7 +39,6 @@
"linker/file_output_stream.cc",
"linker/output_stream.cc",
"linker/vector_output_stream.cc",
- "linker/relative_patcher.cc",
"jit/jit_compiler.cc",
"jit/jit_logger.cc",
"jni/quick/calling_convention.cc",
@@ -102,8 +101,6 @@
arm: {
srcs: [
"jni/quick/arm/calling_convention_arm.cc",
- "linker/arm/relative_patcher_arm_base.cc",
- "linker/arm/relative_patcher_thumb2.cc",
"optimizing/code_generator_arm_vixl.cc",
"optimizing/code_generator_vector_arm_vixl.cc",
"optimizing/instruction_simplifier_arm.cc",
@@ -120,7 +117,6 @@
arm64: {
srcs: [
"jni/quick/arm64/calling_convention_arm64.cc",
- "linker/arm64/relative_patcher_arm64.cc",
"optimizing/code_generator_arm64.cc",
"optimizing/code_generator_vector_arm64.cc",
"optimizing/scheduler_arm64.cc",
@@ -134,7 +130,6 @@
mips: {
srcs: [
"jni/quick/mips/calling_convention_mips.cc",
- "linker/mips/relative_patcher_mips.cc",
"optimizing/code_generator_mips.cc",
"optimizing/code_generator_vector_mips.cc",
"optimizing/instruction_simplifier_mips.cc",
@@ -147,7 +142,6 @@
mips64: {
srcs: [
"jni/quick/mips64/calling_convention_mips64.cc",
- "linker/mips64/relative_patcher_mips64.cc",
"optimizing/code_generator_mips64.cc",
"optimizing/code_generator_vector_mips64.cc",
"optimizing/intrinsics_mips64.cc",
@@ -158,8 +152,6 @@
x86: {
srcs: [
"jni/quick/x86/calling_convention_x86.cc",
- "linker/x86/relative_patcher_x86.cc",
- "linker/x86/relative_patcher_x86_base.cc",
"optimizing/code_generator_x86.cc",
"optimizing/code_generator_vector_x86.cc",
"optimizing/intrinsics_x86.cc",
@@ -173,7 +165,6 @@
x86_64: {
srcs: [
"jni/quick/x86_64/calling_convention_x86_64.cc",
- "linker/x86_64/relative_patcher_x86_64.cc",
"optimizing/intrinsics_x86_64.cc",
"optimizing/code_generator_x86_64.cc",
"optimizing/code_generator_vector_x86_64.cc",
@@ -373,31 +364,25 @@
codegen: {
arm: {
srcs: [
- "linker/arm/relative_patcher_thumb2_test.cc",
"utils/arm/managed_register_arm_test.cc",
],
},
arm64: {
srcs: [
- "linker/arm64/relative_patcher_arm64_test.cc",
"utils/arm64/managed_register_arm64_test.cc",
],
},
mips: {
srcs: [
- "linker/mips/relative_patcher_mips_test.cc",
- "linker/mips/relative_patcher_mips32r6_test.cc",
],
},
mips64: {
srcs: [
- "linker/mips64/relative_patcher_mips64_test.cc",
"utils/mips64/managed_register_mips64_test.cc",
],
},
x86: {
srcs: [
- "linker/x86/relative_patcher_x86_test.cc",
"utils/x86/managed_register_x86_test.cc",
// These tests are testing architecture-independent
@@ -413,7 +398,8 @@
},
x86_64: {
srcs: [
- "linker/x86_64/relative_patcher_x86_64_test.cc",
+ // Is this test a bit-rotten copy of the x86 test? b/77951326
+ // "utils/x86_64/managed_register_x86_64_test.cc",
],
},
},
diff --git a/compiler/optimizing/code_generator_arm_vixl.cc b/compiler/optimizing/code_generator_arm_vixl.cc
index f370586..7350b14 100644
--- a/compiler/optimizing/code_generator_arm_vixl.cc
+++ b/compiler/optimizing/code_generator_arm_vixl.cc
@@ -29,7 +29,6 @@
#include "gc/accounting/card_table.h"
#include "heap_poisoning.h"
#include "intrinsics_arm_vixl.h"
-#include "linker/arm/relative_patcher_thumb2.h"
#include "linker/linker_patch.h"
#include "mirror/array-inl.h"
#include "mirror/class-inl.h"
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index b158231..49b65fd 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -24,7 +24,44 @@
"linker/image_writer.cc",
"linker/multi_oat_relative_patcher.cc",
"linker/oat_writer.cc",
+ "linker/relative_patcher.cc",
],
+
+ codegen: {
+ arm: {
+ srcs: [
+ "linker/arm/relative_patcher_arm_base.cc",
+ "linker/arm/relative_patcher_thumb2.cc",
+ ],
+ },
+ arm64: {
+ srcs: [
+ "linker/arm64/relative_patcher_arm64.cc",
+ ],
+ },
+ mips: {
+ srcs: [
+ "linker/mips/relative_patcher_mips.cc",
+ ],
+ },
+ mips64: {
+ srcs: [
+ "linker/mips64/relative_patcher_mips64.cc",
+ ],
+ },
+ x86: {
+ srcs: [
+ "linker/x86/relative_patcher_x86.cc",
+ "linker/x86/relative_patcher_x86_base.cc",
+ ],
+ },
+ x86_64: {
+ srcs: [
+ "linker/x86_64/relative_patcher_x86_64.cc",
+ ],
+ },
+ },
+
target: {
android: {
// For atrace.
@@ -245,6 +282,41 @@
"linker/multi_oat_relative_patcher_test.cc",
"linker/oat_writer_test.cc",
],
+
+ codegen: {
+ arm: {
+ srcs: [
+ "linker/arm/relative_patcher_thumb2_test.cc",
+ ],
+ },
+ arm64: {
+ srcs: [
+ "linker/arm64/relative_patcher_arm64_test.cc",
+ ],
+ },
+ mips: {
+ srcs: [
+ "linker/mips/relative_patcher_mips_test.cc",
+ "linker/mips/relative_patcher_mips32r6_test.cc",
+ ],
+ },
+ mips64: {
+ srcs: [
+ "linker/mips64/relative_patcher_mips64_test.cc",
+ ],
+ },
+ x86: {
+ srcs: [
+ "linker/x86/relative_patcher_x86_test.cc",
+ ],
+ },
+ x86_64: {
+ srcs: [
+ "linker/x86_64/relative_patcher_x86_64_test.cc",
+ ],
+ },
+ },
+
header_libs: ["dex2oat_headers"],
include_dirs: [
"external/zlib",
diff --git a/compiler/linker/arm/relative_patcher_arm_base.cc b/dex2oat/linker/arm/relative_patcher_arm_base.cc
similarity index 100%
rename from compiler/linker/arm/relative_patcher_arm_base.cc
rename to dex2oat/linker/arm/relative_patcher_arm_base.cc
diff --git a/compiler/linker/arm/relative_patcher_arm_base.h b/dex2oat/linker/arm/relative_patcher_arm_base.h
similarity index 96%
rename from compiler/linker/arm/relative_patcher_arm_base.h
rename to dex2oat/linker/arm/relative_patcher_arm_base.h
index 963d669..f5a1395 100644
--- a/compiler/linker/arm/relative_patcher_arm_base.h
+++ b/dex2oat/linker/arm/relative_patcher_arm_base.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_COMPILER_LINKER_ARM_RELATIVE_PATCHER_ARM_BASE_H_
-#define ART_COMPILER_LINKER_ARM_RELATIVE_PATCHER_ARM_BASE_H_
+#ifndef ART_DEX2OAT_LINKER_ARM_RELATIVE_PATCHER_ARM_BASE_H_
+#define ART_DEX2OAT_LINKER_ARM_RELATIVE_PATCHER_ARM_BASE_H_
#include <deque>
#include <vector>
@@ -155,4 +155,4 @@
} // namespace linker
} // namespace art
-#endif // ART_COMPILER_LINKER_ARM_RELATIVE_PATCHER_ARM_BASE_H_
+#endif // ART_DEX2OAT_LINKER_ARM_RELATIVE_PATCHER_ARM_BASE_H_
diff --git a/compiler/linker/arm/relative_patcher_thumb2.cc b/dex2oat/linker/arm/relative_patcher_thumb2.cc
similarity index 100%
rename from compiler/linker/arm/relative_patcher_thumb2.cc
rename to dex2oat/linker/arm/relative_patcher_thumb2.cc
diff --git a/compiler/linker/arm/relative_patcher_thumb2.h b/dex2oat/linker/arm/relative_patcher_thumb2.h
similarity index 92%
rename from compiler/linker/arm/relative_patcher_thumb2.h
rename to dex2oat/linker/arm/relative_patcher_thumb2.h
index 68610d6..3a42928 100644
--- a/compiler/linker/arm/relative_patcher_thumb2.h
+++ b/dex2oat/linker/arm/relative_patcher_thumb2.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_COMPILER_LINKER_ARM_RELATIVE_PATCHER_THUMB2_H_
-#define ART_COMPILER_LINKER_ARM_RELATIVE_PATCHER_THUMB2_H_
+#ifndef ART_DEX2OAT_LINKER_ARM_RELATIVE_PATCHER_THUMB2_H_
+#define ART_DEX2OAT_LINKER_ARM_RELATIVE_PATCHER_THUMB2_H_
#include "arch/arm/registers_arm.h"
#include "base/array_ref.h"
@@ -70,4 +70,4 @@
} // namespace linker
} // namespace art
-#endif // ART_COMPILER_LINKER_ARM_RELATIVE_PATCHER_THUMB2_H_
+#endif // ART_DEX2OAT_LINKER_ARM_RELATIVE_PATCHER_THUMB2_H_
diff --git a/compiler/linker/arm/relative_patcher_thumb2_test.cc b/dex2oat/linker/arm/relative_patcher_thumb2_test.cc
similarity index 100%
rename from compiler/linker/arm/relative_patcher_thumb2_test.cc
rename to dex2oat/linker/arm/relative_patcher_thumb2_test.cc
diff --git a/compiler/linker/arm64/relative_patcher_arm64.cc b/dex2oat/linker/arm64/relative_patcher_arm64.cc
similarity index 100%
rename from compiler/linker/arm64/relative_patcher_arm64.cc
rename to dex2oat/linker/arm64/relative_patcher_arm64.cc
diff --git a/compiler/linker/arm64/relative_patcher_arm64.h b/dex2oat/linker/arm64/relative_patcher_arm64.h
similarity index 93%
rename from compiler/linker/arm64/relative_patcher_arm64.h
rename to dex2oat/linker/arm64/relative_patcher_arm64.h
index 9dc289d..f7f673c 100644
--- a/compiler/linker/arm64/relative_patcher_arm64.h
+++ b/dex2oat/linker/arm64/relative_patcher_arm64.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_COMPILER_LINKER_ARM64_RELATIVE_PATCHER_ARM64_H_
-#define ART_COMPILER_LINKER_ARM64_RELATIVE_PATCHER_ARM64_H_
+#ifndef ART_DEX2OAT_LINKER_ARM64_RELATIVE_PATCHER_ARM64_H_
+#define ART_DEX2OAT_LINKER_ARM64_RELATIVE_PATCHER_ARM64_H_
#include "base/array_ref.h"
#include "linker/arm/relative_patcher_arm_base.h"
@@ -81,4 +81,4 @@
} // namespace linker
} // namespace art
-#endif // ART_COMPILER_LINKER_ARM64_RELATIVE_PATCHER_ARM64_H_
+#endif // ART_DEX2OAT_LINKER_ARM64_RELATIVE_PATCHER_ARM64_H_
diff --git a/compiler/linker/arm64/relative_patcher_arm64_test.cc b/dex2oat/linker/arm64/relative_patcher_arm64_test.cc
similarity index 100%
rename from compiler/linker/arm64/relative_patcher_arm64_test.cc
rename to dex2oat/linker/arm64/relative_patcher_arm64_test.cc
diff --git a/compiler/linker/mips/relative_patcher_mips.cc b/dex2oat/linker/mips/relative_patcher_mips.cc
similarity index 100%
rename from compiler/linker/mips/relative_patcher_mips.cc
rename to dex2oat/linker/mips/relative_patcher_mips.cc
diff --git a/compiler/linker/mips/relative_patcher_mips.h b/dex2oat/linker/mips/relative_patcher_mips.h
similarity index 91%
rename from compiler/linker/mips/relative_patcher_mips.h
rename to dex2oat/linker/mips/relative_patcher_mips.h
index 5714a7d..d3a4c5a 100644
--- a/compiler/linker/mips/relative_patcher_mips.h
+++ b/dex2oat/linker/mips/relative_patcher_mips.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_COMPILER_LINKER_MIPS_RELATIVE_PATCHER_MIPS_H_
-#define ART_COMPILER_LINKER_MIPS_RELATIVE_PATCHER_MIPS_H_
+#ifndef ART_DEX2OAT_LINKER_MIPS_RELATIVE_PATCHER_MIPS_H_
+#define ART_DEX2OAT_LINKER_MIPS_RELATIVE_PATCHER_MIPS_H_
#include "arch/mips/instruction_set_features_mips.h"
#include "linker/relative_patcher.h"
@@ -55,4 +55,4 @@
} // namespace linker
} // namespace art
-#endif // ART_COMPILER_LINKER_MIPS_RELATIVE_PATCHER_MIPS_H_
+#endif // ART_DEX2OAT_LINKER_MIPS_RELATIVE_PATCHER_MIPS_H_
diff --git a/compiler/linker/mips/relative_patcher_mips32r6_test.cc b/dex2oat/linker/mips/relative_patcher_mips32r6_test.cc
similarity index 100%
rename from compiler/linker/mips/relative_patcher_mips32r6_test.cc
rename to dex2oat/linker/mips/relative_patcher_mips32r6_test.cc
diff --git a/compiler/linker/mips/relative_patcher_mips_test.cc b/dex2oat/linker/mips/relative_patcher_mips_test.cc
similarity index 100%
rename from compiler/linker/mips/relative_patcher_mips_test.cc
rename to dex2oat/linker/mips/relative_patcher_mips_test.cc
diff --git a/compiler/linker/mips64/relative_patcher_mips64.cc b/dex2oat/linker/mips64/relative_patcher_mips64.cc
similarity index 100%
rename from compiler/linker/mips64/relative_patcher_mips64.cc
rename to dex2oat/linker/mips64/relative_patcher_mips64.cc
diff --git a/compiler/linker/mips64/relative_patcher_mips64.h b/dex2oat/linker/mips64/relative_patcher_mips64.h
similarity index 90%
rename from compiler/linker/mips64/relative_patcher_mips64.h
rename to dex2oat/linker/mips64/relative_patcher_mips64.h
index 183bbed..9f5a125 100644
--- a/compiler/linker/mips64/relative_patcher_mips64.h
+++ b/dex2oat/linker/mips64/relative_patcher_mips64.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_COMPILER_LINKER_MIPS64_RELATIVE_PATCHER_MIPS64_H_
-#define ART_COMPILER_LINKER_MIPS64_RELATIVE_PATCHER_MIPS64_H_
+#ifndef ART_DEX2OAT_LINKER_MIPS64_RELATIVE_PATCHER_MIPS64_H_
+#define ART_DEX2OAT_LINKER_MIPS64_RELATIVE_PATCHER_MIPS64_H_
#include "linker/relative_patcher.h"
@@ -51,4 +51,4 @@
} // namespace linker
} // namespace art
-#endif // ART_COMPILER_LINKER_MIPS64_RELATIVE_PATCHER_MIPS64_H_
+#endif // ART_DEX2OAT_LINKER_MIPS64_RELATIVE_PATCHER_MIPS64_H_
diff --git a/compiler/linker/mips64/relative_patcher_mips64_test.cc b/dex2oat/linker/mips64/relative_patcher_mips64_test.cc
similarity index 100%
rename from compiler/linker/mips64/relative_patcher_mips64_test.cc
rename to dex2oat/linker/mips64/relative_patcher_mips64_test.cc
diff --git a/compiler/linker/relative_patcher.cc b/dex2oat/linker/relative_patcher.cc
similarity index 99%
rename from compiler/linker/relative_patcher.cc
rename to dex2oat/linker/relative_patcher.cc
index b82d152..b6135c9 100644
--- a/compiler/linker/relative_patcher.cc
+++ b/dex2oat/linker/relative_patcher.cc
@@ -35,7 +35,7 @@
#ifdef ART_ENABLE_CODEGEN_x86_64
#include "linker/x86_64/relative_patcher_x86_64.h"
#endif
-#include "output_stream.h"
+#include "linker/output_stream.h"
namespace art {
namespace linker {
diff --git a/compiler/linker/relative_patcher.h b/dex2oat/linker/relative_patcher.h
similarity index 97%
rename from compiler/linker/relative_patcher.h
rename to dex2oat/linker/relative_patcher.h
index 06c7e70..d80eaf9 100644
--- a/compiler/linker/relative_patcher.h
+++ b/dex2oat/linker/relative_patcher.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_COMPILER_LINKER_RELATIVE_PATCHER_H_
-#define ART_COMPILER_LINKER_RELATIVE_PATCHER_H_
+#ifndef ART_DEX2OAT_LINKER_RELATIVE_PATCHER_H_
+#define ART_DEX2OAT_LINKER_RELATIVE_PATCHER_H_
#include <vector>
@@ -167,4 +167,4 @@
} // namespace linker
} // namespace art
-#endif // ART_COMPILER_LINKER_RELATIVE_PATCHER_H_
+#endif // ART_DEX2OAT_LINKER_RELATIVE_PATCHER_H_
diff --git a/compiler/linker/relative_patcher_test.h b/dex2oat/linker/relative_patcher_test.h
similarity index 98%
rename from compiler/linker/relative_patcher_test.h
rename to dex2oat/linker/relative_patcher_test.h
index af8dc4d..3f7c855 100644
--- a/compiler/linker/relative_patcher_test.h
+++ b/dex2oat/linker/relative_patcher_test.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_COMPILER_LINKER_RELATIVE_PATCHER_TEST_H_
-#define ART_COMPILER_LINKER_RELATIVE_PATCHER_TEST_H_
+#ifndef ART_DEX2OAT_LINKER_RELATIVE_PATCHER_TEST_H_
+#define ART_DEX2OAT_LINKER_RELATIVE_PATCHER_TEST_H_
#include "arch/instruction_set.h"
#include "arch/instruction_set_features.h"
@@ -30,9 +30,9 @@
#include "globals.h"
#include "gtest/gtest.h"
#include "linker/relative_patcher.h"
+#include "linker/vector_output_stream.h"
#include "oat.h"
#include "oat_quick_method_header.h"
-#include "vector_output_stream.h"
namespace art {
namespace linker {
@@ -356,4 +356,4 @@
} // namespace linker
} // namespace art
-#endif // ART_COMPILER_LINKER_RELATIVE_PATCHER_TEST_H_
+#endif // ART_DEX2OAT_LINKER_RELATIVE_PATCHER_TEST_H_
diff --git a/compiler/linker/x86/relative_patcher_x86.cc b/dex2oat/linker/x86/relative_patcher_x86.cc
similarity index 100%
rename from compiler/linker/x86/relative_patcher_x86.cc
rename to dex2oat/linker/x86/relative_patcher_x86.cc
diff --git a/compiler/linker/x86/relative_patcher_x86.h b/dex2oat/linker/x86/relative_patcher_x86.h
similarity index 88%
rename from compiler/linker/x86/relative_patcher_x86.h
rename to dex2oat/linker/x86/relative_patcher_x86.h
index 63a8338..e723580 100644
--- a/compiler/linker/x86/relative_patcher_x86.h
+++ b/dex2oat/linker/x86/relative_patcher_x86.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_COMPILER_LINKER_X86_RELATIVE_PATCHER_X86_H_
-#define ART_COMPILER_LINKER_X86_RELATIVE_PATCHER_X86_H_
+#ifndef ART_DEX2OAT_LINKER_X86_RELATIVE_PATCHER_X86_H_
+#define ART_DEX2OAT_LINKER_X86_RELATIVE_PATCHER_X86_H_
#include "linker/x86/relative_patcher_x86_base.h"
@@ -38,4 +38,4 @@
} // namespace linker
} // namespace art
-#endif // ART_COMPILER_LINKER_X86_RELATIVE_PATCHER_X86_H_
+#endif // ART_DEX2OAT_LINKER_X86_RELATIVE_PATCHER_X86_H_
diff --git a/compiler/linker/x86/relative_patcher_x86_base.cc b/dex2oat/linker/x86/relative_patcher_x86_base.cc
similarity index 100%
rename from compiler/linker/x86/relative_patcher_x86_base.cc
rename to dex2oat/linker/x86/relative_patcher_x86_base.cc
diff --git a/compiler/linker/x86/relative_patcher_x86_base.h b/dex2oat/linker/x86/relative_patcher_x86_base.h
similarity index 90%
rename from compiler/linker/x86/relative_patcher_x86_base.h
rename to dex2oat/linker/x86/relative_patcher_x86_base.h
index 6097345..4cc7b07 100644
--- a/compiler/linker/x86/relative_patcher_x86_base.h
+++ b/dex2oat/linker/x86/relative_patcher_x86_base.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_COMPILER_LINKER_X86_RELATIVE_PATCHER_X86_BASE_H_
-#define ART_COMPILER_LINKER_X86_RELATIVE_PATCHER_X86_BASE_H_
+#ifndef ART_DEX2OAT_LINKER_X86_RELATIVE_PATCHER_X86_BASE_H_
+#define ART_DEX2OAT_LINKER_X86_RELATIVE_PATCHER_X86_BASE_H_
#include "linker/relative_patcher.h"
@@ -50,4 +50,4 @@
} // namespace linker
} // namespace art
-#endif // ART_COMPILER_LINKER_X86_RELATIVE_PATCHER_X86_BASE_H_
+#endif // ART_DEX2OAT_LINKER_X86_RELATIVE_PATCHER_X86_BASE_H_
diff --git a/compiler/linker/x86/relative_patcher_x86_test.cc b/dex2oat/linker/x86/relative_patcher_x86_test.cc
similarity index 100%
rename from compiler/linker/x86/relative_patcher_x86_test.cc
rename to dex2oat/linker/x86/relative_patcher_x86_test.cc
diff --git a/compiler/linker/x86_64/relative_patcher_x86_64.cc b/dex2oat/linker/x86_64/relative_patcher_x86_64.cc
similarity index 100%
rename from compiler/linker/x86_64/relative_patcher_x86_64.cc
rename to dex2oat/linker/x86_64/relative_patcher_x86_64.cc
diff --git a/compiler/linker/x86_64/relative_patcher_x86_64.h b/dex2oat/linker/x86_64/relative_patcher_x86_64.h
similarity index 87%
rename from compiler/linker/x86_64/relative_patcher_x86_64.h
rename to dex2oat/linker/x86_64/relative_patcher_x86_64.h
index 4f3ec49..a31e1eb 100644
--- a/compiler/linker/x86_64/relative_patcher_x86_64.h
+++ b/dex2oat/linker/x86_64/relative_patcher_x86_64.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_COMPILER_LINKER_X86_64_RELATIVE_PATCHER_X86_64_H_
-#define ART_COMPILER_LINKER_X86_64_RELATIVE_PATCHER_X86_64_H_
+#ifndef ART_DEX2OAT_LINKER_X86_64_RELATIVE_PATCHER_X86_64_H_
+#define ART_DEX2OAT_LINKER_X86_64_RELATIVE_PATCHER_X86_64_H_
#include "linker/x86/relative_patcher_x86_base.h"
@@ -38,4 +38,4 @@
} // namespace linker
} // namespace art
-#endif // ART_COMPILER_LINKER_X86_64_RELATIVE_PATCHER_X86_64_H_
+#endif // ART_DEX2OAT_LINKER_X86_64_RELATIVE_PATCHER_X86_64_H_
diff --git a/compiler/linker/x86_64/relative_patcher_x86_64_test.cc b/dex2oat/linker/x86_64/relative_patcher_x86_64_test.cc
similarity index 100%
rename from compiler/linker/x86_64/relative_patcher_x86_64_test.cc
rename to dex2oat/linker/x86_64/relative_patcher_x86_64_test.cc