Merge "Move vector output stream to compiler." into dalvik-dev
diff --git a/compiler/Android.mk b/compiler/Android.mk
index c0f6181..95c9a69 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -88,7 +88,8 @@
 	elf_writer.cc \
 	elf_writer_quick.cc \
 	image_writer.cc \
-	oat_writer.cc
+	oat_writer.cc \
+	vector_output_stream.cc
 
 ifeq ($(ART_SEA_IR_MODE),true)
 LIBART_COMPILER_SRC_FILES += \
diff --git a/runtime/vector_output_stream.cc b/compiler/vector_output_stream.cc
similarity index 100%
rename from runtime/vector_output_stream.cc
rename to compiler/vector_output_stream.cc
diff --git a/runtime/vector_output_stream.h b/compiler/vector_output_stream.h
similarity index 92%
rename from runtime/vector_output_stream.h
rename to compiler/vector_output_stream.h
index 7daa39f..a3f8226 100644
--- a/runtime/vector_output_stream.h
+++ b/compiler/vector_output_stream.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_RUNTIME_VECTOR_OUTPUT_STREAM_H_
-#define ART_RUNTIME_VECTOR_OUTPUT_STREAM_H_
+#ifndef ART_COMPILER_VECTOR_OUTPUT_STREAM_H_
+#define ART_COMPILER_VECTOR_OUTPUT_STREAM_H_
 
 #include "output_stream.h"
 
@@ -62,4 +62,4 @@
 
 }  // namespace art
 
-#endif  // ART_RUNTIME_VECTOR_OUTPUT_STREAM_H_
+#endif  // ART_COMPILER_VECTOR_OUTPUT_STREAM_H_
diff --git a/runtime/Android.mk b/runtime/Android.mk
index 8867d40..bc6a2ed 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -129,7 +129,6 @@
 	trace.cc \
 	utf.cc \
 	utils.cc \
-	vector_output_stream.cc \
 	verifier/dex_gc_map.cc \
 	verifier/instruction_flags.cc \
 	verifier/method_verifier.cc \