Move some utils from `compiler/` to `dex2oat/`.

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Change-Id: If1cd12c358e22e678e425e2a1350cecf0a90a8bd

11 files changed, 16 insertions, 17 deletions

diff --git a/compiler/Android.bp b/compiler/Android.bp
index ef56e7f3ad..73994f7d95 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -438,7 +438,6 @@ art_cc_defaults {
     name: "art_compiler_tests_defaults",
     device_common_data: [
         ":art-gtest-jars-ExceptionHandle",
-        ":art-gtest-jars-Interfaces",
         ":art-gtest-jars-Main",
         ":art-gtest-jars-MyClassNatives",
     ],
@@ -489,8 +488,6 @@ art_cc_defaults {
         "optimizing/stack_map_test.cc",
         "optimizing/superblock_cloner_test.cc",
         "optimizing/suspend_check_test.cc",
-        "utils/atomic_dex_ref_map_test.cc",
-        "utils/dedupe_set_test.cc",
 
         "optimizing/codegen_test.cc",
         "optimizing/instruction_simplifier_test.cc",
diff --git a/compiler/art_standalone_compiler_tests.xml b/compiler/art_standalone_compiler_tests.xml
index c2065dd766..813a6f10d0 100644
--- a/compiler/art_standalone_compiler_tests.xml
+++ b/compiler/art_standalone_compiler_tests.xml
@@ -26,7 +26,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="cleanup" value="true" />
         <option name="push" value="art-gtest-jars-ExceptionHandle.jar->/data/local/tmp/art_standalone_compiler_tests/art-gtest-jars-ExceptionHandle.jar" />
-        <option name="push" value="art-gtest-jars-Interfaces.jar->/data/local/tmp/art_standalone_compiler_tests/art-gtest-jars-Interfaces.jar" />
         <option name="push" value="art-gtest-jars-Main.jar->/data/local/tmp/art_standalone_compiler_tests/art-gtest-jars-Main.jar" />
         <option name="push" value="art-gtest-jars-MyClassNatives.jar->/data/local/tmp/art_standalone_compiler_tests/art-gtest-jars-MyClassNatives.jar" />
     </target_preparer>
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc
index 26800637fa..e54c85f747 100644
--- a/compiler/common_compiler_test.cc
+++ b/compiler/common_compiler_test.cc
@@ -41,7 +41,6 @@
 #include "oat/oat_quick_method_header.h"
 #include "scoped_thread_state_change-inl.h"
 #include "thread-current-inl.h"
-#include "utils/atomic_dex_ref_map-inl.h"
 
 namespace art HIDDEN {
 
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 5df1fbbad2..f97aef2deb 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -421,6 +421,7 @@ art_cc_defaults {
         ":art-gtest-jars-Dex2oatVdexTestDex",
         ":art-gtest-jars-ImageLayoutA",
         ":art-gtest-jars-ImageLayoutB",
+        ":art-gtest-jars-Interfaces",
         ":art-gtest-jars-LinkageTest",
         ":art-gtest-jars-Main",
         ":art-gtest-jars-MainEmptyUncompressed",
@@ -466,6 +467,8 @@ art_cc_defaults {
         "linker/oat_writer_test.cc",
         "transaction_test.cc",
         "verifier_deps_test.cc",
+        "utils/atomic_dex_ref_map_test.cc",
+        "utils/dedupe_set_test.cc",
         "utils/swap_space_test.cc",
     ],
     target: {
diff --git a/dex2oat/art_standalone_dex2oat_tests.xml b/dex2oat/art_standalone_dex2oat_tests.xml
index d86eb154bb..d58d691556 100644
--- a/dex2oat/art_standalone_dex2oat_tests.xml
+++ b/dex2oat/art_standalone_dex2oat_tests.xml
@@ -33,6 +33,7 @@
         <option name="push" value="art-gtest-jars-Dex2oatVdexTestDex.jar->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-Dex2oatVdexTestDex.jar" />
         <option name="push" value="art-gtest-jars-ImageLayoutA.jar->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-ImageLayoutA.jar" />
         <option name="push" value="art-gtest-jars-ImageLayoutB.jar->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-ImageLayoutB.jar" />
+        <option name="push" value="art-gtest-jars-Interfaces.jar->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-Interfaces.jar" />
         <option name="push" value="art-gtest-jars-LinkageTest.dex->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-LinkageTest.dex" />
         <option name="push" value="art-gtest-jars-Main.jar->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-Main.jar" />
         <option name="push" value="art-gtest-jars-MainEmptyUncompressed.jar->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-MainEmptyUncompressed.jar" />
diff --git a/compiler/utils/atomic_dex_ref_map-inl.h b/dex2oat/utils/atomic_dex_ref_map-inl.h
index 653d21b3ea..b36671c347 100644
--- a/compiler/utils/atomic_dex_ref_map-inl.h
+++ b/dex2oat/utils/atomic_dex_ref_map-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_COMPILER_UTILS_ATOMIC_DEX_REF_MAP_INL_H_
-#define ART_COMPILER_UTILS_ATOMIC_DEX_REF_MAP_INL_H_
+#ifndef ART_DEX2OAT_UTILS_ATOMIC_DEX_REF_MAP_INL_H_
+#define ART_DEX2OAT_UTILS_ATOMIC_DEX_REF_MAP_INL_H_
 
 #include "atomic_dex_ref_map.h"
 
@@ -147,4 +147,4 @@ inline std::vector<const DexFile*> AtomicDexRefMap<DexFileReferenceType, Value>:
 
 }  // namespace art
 
-#endif  // ART_COMPILER_UTILS_ATOMIC_DEX_REF_MAP_INL_H_
+#endif  // ART_DEX2OAT_UTILS_ATOMIC_DEX_REF_MAP_INL_H_
diff --git a/compiler/utils/atomic_dex_ref_map.h b/dex2oat/utils/atomic_dex_ref_map.h
index b10fef50c5..8f25b8b3ec 100644
--- a/compiler/utils/atomic_dex_ref_map.h
+++ b/dex2oat/utils/atomic_dex_ref_map.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_COMPILER_UTILS_ATOMIC_DEX_REF_MAP_H_
-#define ART_COMPILER_UTILS_ATOMIC_DEX_REF_MAP_H_
+#ifndef ART_DEX2OAT_UTILS_ATOMIC_DEX_REF_MAP_H_
+#define ART_DEX2OAT_UTILS_ATOMIC_DEX_REF_MAP_H_
 
 #include "base/atomic.h"
 #include "base/dchecked_vector.h"
@@ -83,4 +83,4 @@ class AtomicDexRefMap {
 
 }  // namespace art
 
-#endif  // ART_COMPILER_UTILS_ATOMIC_DEX_REF_MAP_H_
+#endif  // ART_DEX2OAT_UTILS_ATOMIC_DEX_REF_MAP_H_
diff --git a/compiler/utils/atomic_dex_ref_map_test.cc b/dex2oat/utils/atomic_dex_ref_map_test.cc
index 329735b796..329735b796 100644
--- a/compiler/utils/atomic_dex_ref_map_test.cc
+++ b/dex2oat/utils/atomic_dex_ref_map_test.cc
diff --git a/compiler/utils/dedupe_set-inl.h b/dex2oat/utils/dedupe_set-inl.h
index db744c53f7..5de82c534b 100644
--- a/compiler/utils/dedupe_set-inl.h
+++ b/dex2oat/utils/dedupe_set-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_COMPILER_UTILS_DEDUPE_SET_INL_H_
-#define ART_COMPILER_UTILS_DEDUPE_SET_INL_H_
+#ifndef ART_DEX2OAT_UTILS_DEDUPE_SET_INL_H_
+#define ART_DEX2OAT_UTILS_DEDUPE_SET_INL_H_
 
 #include "dedupe_set.h"
 
@@ -272,4 +272,4 @@ std::string DedupeSet<InKey, StoreKey, Alloc, HashType, HashFunc, kShard>::DumpS
 
 }  // namespace art
 
-#endif  // ART_COMPILER_UTILS_DEDUPE_SET_INL_H_
+#endif  // ART_DEX2OAT_UTILS_DEDUPE_SET_INL_H_
diff --git a/compiler/utils/dedupe_set.h b/dex2oat/utils/dedupe_set.h
index 42db8e3ca0..2b8d713cb8 100644
--- a/compiler/utils/dedupe_set.h
+++ b/dex2oat/utils/dedupe_set.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_COMPILER_UTILS_DEDUPE_SET_H_
-#define ART_COMPILER_UTILS_DEDUPE_SET_H_
+#ifndef ART_DEX2OAT_UTILS_DEDUPE_SET_H_
+#define ART_DEX2OAT_UTILS_DEDUPE_SET_H_
 
 #include <stdint.h>
 #include <memory>
@@ -61,4 +61,4 @@ class DedupeSet {
 
 }  // namespace art
 
-#endif  // ART_COMPILER_UTILS_DEDUPE_SET_H_
+#endif  // ART_DEX2OAT_UTILS_DEDUPE_SET_H_
diff --git a/compiler/utils/dedupe_set_test.cc b/dex2oat/utils/dedupe_set_test.cc
index 89385e7c82..89385e7c82 100644
--- a/compiler/utils/dedupe_set_test.cc
+++ b/dex2oat/utils/dedupe_set_test.cc