diff options
| author | 2013-07-29 18:20:01 +0000 | |
|---|---|---|
| committer | 2013-07-29 18:20:01 +0000 | |
| commit | c95d6b1cb35b382804b9a310d32f66059eca65d9 (patch) | |
| tree | c1425fd0cb38efd47bfbc97fff839fbac922e02c | |
| parent | 166db04e259ca51838c311891598664deeed85ad (diff) | |
| parent | b07b8b7a1815fc22c0e7b3f0899406cc7eeebaca (diff) | |
Merge "Move vector output stream to compiler." into dalvik-dev
| -rw-r--r-- | compiler/Android.mk | 3 | ||||
| -rw-r--r-- | compiler/vector_output_stream.cc (renamed from runtime/vector_output_stream.cc) | 0 | ||||
| -rw-r--r-- | compiler/vector_output_stream.h (renamed from runtime/vector_output_stream.h) | 6 | ||||
| -rw-r--r-- | runtime/Android.mk | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk index c0f6181ccd..95c9a69228 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -88,7 +88,8 @@ LIBART_COMPILER_SRC_FILES := \ 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 index e5ff729036..e5ff729036 100644 --- a/runtime/vector_output_stream.cc +++ b/compiler/vector_output_stream.cc diff --git a/runtime/vector_output_stream.h b/compiler/vector_output_stream.h index 7daa39ffa5..a3f82262af 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 @@ class VectorOutputStream : public OutputStream { } // 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 8867d40c55..bc6a2ed2f8 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -129,7 +129,6 @@ LIBART_COMMON_SRC_FILES := \ trace.cc \ utf.cc \ utils.cc \ - vector_output_stream.cc \ verifier/dex_gc_map.cc \ verifier/instruction_flags.cc \ verifier/method_verifier.cc \ |