ART: remove nested include in arch_test

arch_test #includes asm_support.h while inside the art namespace.
We've gotten away with this until now because the files that
asm_support.h includes had already been included earlier (and thus,
were empty via the #ifdef guard).  However, adding new #includes to
asm_support.h results in art::art:: namespace ugliness.

Change-Id: Ie2671c456bb631976b4280f29a5656b086138047

1 files changed, 3 insertions, 4 deletions

diff --git a/runtime/arch/arch_test.cc b/runtime/arch/arch_test.cc
index 1680bbda1e..ee31c58979 100644
--- a/runtime/arch/arch_test.cc
+++ b/runtime/arch/arch_test.cc
@@ -19,6 +19,9 @@
 #include "art_method-inl.h"
 #include "common_runtime_test.h"
 #include "quick/quick_method_frame_info.h"
+// Common tests are declared next to the constants.
+#define ADD_TEST_EQ(x, y) EXPECT_EQ(x, y);
+#include "asm_support.h"
 
 namespace art {
 
@@ -53,10 +56,6 @@ class ArchTest : public CommonRuntimeTest {
   }
 };
 
-// Common tests are declared next to the constants.
-#define ADD_TEST_EQ(x, y) EXPECT_EQ(x, y);
-#include "asm_support.h"
-
 TEST_F(ArchTest, CheckCommonOffsetsAndSizes) {
   CheckAsmSupportOffsetsAndSizes();
 }