Desktop Head Unit: protobuf prebuilts.

- Move the linux-x86 prebuilt to linux-x86_64
- Add windows prebuilts
- Update PREBUILT to include build instructions

Change-Id: I49090282ea66c09294dfc6770df17727b965f77c
diff --git a/linux-x86/protobuf2.5/PREBUILT b/linux-x86/protobuf2.5/PREBUILT
deleted file mode 100644
index 292eec7..0000000
--- a/linux-x86/protobuf2.5/PREBUILT
+++ /dev/null
@@ -1,2 +0,0 @@
-The binaries in this prebuilt directory can be rebuilt using
-the source in external/protobuf2.5
diff --git a/linux-x86/protobuf2.5/lib/libprotobuf-lite.so.8.0.0 b/linux-x86/protobuf2.5/lib/libprotobuf-lite.so.8.0.0
deleted file mode 100755
index a374086..0000000
--- a/linux-x86/protobuf2.5/lib/libprotobuf-lite.so.8.0.0
+++ /dev/null
Binary files differ
diff --git a/linux-x86/protobuf2.5/protoc b/linux-x86/protobuf2.5/protoc
deleted file mode 100755
index 1d4bd01..0000000
--- a/linux-x86/protobuf2.5/protoc
+++ /dev/null
Binary files differ
diff --git a/linux-x86/protobuf2.5/MODULE_LICENSE_APACHE2 b/linux-x86_64/protobuf2.5/MODULE_LICENSE_APACHE2
similarity index 100%
rename from linux-x86/protobuf2.5/MODULE_LICENSE_APACHE2
rename to linux-x86_64/protobuf2.5/MODULE_LICENSE_APACHE2
diff --git a/linux-x86_64/protobuf2.5/PREBUILT b/linux-x86_64/protobuf2.5/PREBUILT
new file mode 100644
index 0000000..d9dad16
--- /dev/null
+++ b/linux-x86_64/protobuf2.5/PREBUILT
@@ -0,0 +1,6 @@
+The binaries in this prebuilt directory can be rebuilt using
+the source in external/protobuf2.5
+
+cd external/protobuf2.5
+./configure --prefix=path/to/prebuilts/misc/linux-x86_64/protobuf2.5
+make && make install
diff --git a/linux-x86_64/protobuf2.5/bin/protoc b/linux-x86_64/protobuf2.5/bin/protoc
new file mode 100755
index 0000000..91eaa3b
--- /dev/null
+++ b/linux-x86_64/protobuf2.5/bin/protoc
Binary files differ
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/code_generator.h b/linux-x86_64/protobuf2.5/include/google/protobuf/compiler/code_generator.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/compiler/code_generator.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/compiler/code_generator.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/command_line_interface.h b/linux-x86_64/protobuf2.5/include/google/protobuf/compiler/command_line_interface.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/compiler/command_line_interface.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/compiler/command_line_interface.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/cpp/cpp_generator.h b/linux-x86_64/protobuf2.5/include/google/protobuf/compiler/cpp/cpp_generator.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/compiler/cpp/cpp_generator.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/compiler/cpp/cpp_generator.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/importer.h b/linux-x86_64/protobuf2.5/include/google/protobuf/compiler/importer.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/compiler/importer.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/compiler/importer.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/java/java_generator.h b/linux-x86_64/protobuf2.5/include/google/protobuf/compiler/java/java_generator.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/compiler/java/java_generator.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/compiler/java/java_generator.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/parser.h b/linux-x86_64/protobuf2.5/include/google/protobuf/compiler/parser.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/compiler/parser.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/compiler/parser.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/plugin.h b/linux-x86_64/protobuf2.5/include/google/protobuf/compiler/plugin.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/compiler/plugin.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/compiler/plugin.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/plugin.pb.h b/linux-x86_64/protobuf2.5/include/google/protobuf/compiler/plugin.pb.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/compiler/plugin.pb.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/compiler/plugin.pb.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/plugin.proto b/linux-x86_64/protobuf2.5/include/google/protobuf/compiler/plugin.proto
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/compiler/plugin.proto
rename to linux-x86_64/protobuf2.5/include/google/protobuf/compiler/plugin.proto
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/python/python_generator.h b/linux-x86_64/protobuf2.5/include/google/protobuf/compiler/python/python_generator.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/compiler/python/python_generator.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/compiler/python/python_generator.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/descriptor.h b/linux-x86_64/protobuf2.5/include/google/protobuf/descriptor.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/descriptor.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/descriptor.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/descriptor.pb.h b/linux-x86_64/protobuf2.5/include/google/protobuf/descriptor.pb.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/descriptor.pb.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/descriptor.pb.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/descriptor.proto b/linux-x86_64/protobuf2.5/include/google/protobuf/descriptor.proto
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/descriptor.proto
rename to linux-x86_64/protobuf2.5/include/google/protobuf/descriptor.proto
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/descriptor_database.h b/linux-x86_64/protobuf2.5/include/google/protobuf/descriptor_database.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/descriptor_database.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/descriptor_database.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/dynamic_message.h b/linux-x86_64/protobuf2.5/include/google/protobuf/dynamic_message.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/dynamic_message.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/dynamic_message.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/extension_set.h b/linux-x86_64/protobuf2.5/include/google/protobuf/extension_set.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/extension_set.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/extension_set.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/generated_enum_reflection.h b/linux-x86_64/protobuf2.5/include/google/protobuf/generated_enum_reflection.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/generated_enum_reflection.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/generated_enum_reflection.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/generated_message_reflection.h b/linux-x86_64/protobuf2.5/include/google/protobuf/generated_message_reflection.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/generated_message_reflection.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/generated_message_reflection.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/generated_message_util.h b/linux-x86_64/protobuf2.5/include/google/protobuf/generated_message_util.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/generated_message_util.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/generated_message_util.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/coded_stream.h b/linux-x86_64/protobuf2.5/include/google/protobuf/io/coded_stream.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/io/coded_stream.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/io/coded_stream.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/gzip_stream.h b/linux-x86_64/protobuf2.5/include/google/protobuf/io/gzip_stream.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/io/gzip_stream.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/io/gzip_stream.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/printer.h b/linux-x86_64/protobuf2.5/include/google/protobuf/io/printer.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/io/printer.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/io/printer.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/tokenizer.h b/linux-x86_64/protobuf2.5/include/google/protobuf/io/tokenizer.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/io/tokenizer.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/io/tokenizer.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/zero_copy_stream.h b/linux-x86_64/protobuf2.5/include/google/protobuf/io/zero_copy_stream.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/io/zero_copy_stream.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/io/zero_copy_stream.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl.h b/linux-x86_64/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl_lite.h b/linux-x86_64/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl_lite.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl_lite.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl_lite.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/message.h b/linux-x86_64/protobuf2.5/include/google/protobuf/message.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/message.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/message.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/message_lite.h b/linux-x86_64/protobuf2.5/include/google/protobuf/message_lite.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/message_lite.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/message_lite.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/reflection_ops.h b/linux-x86_64/protobuf2.5/include/google/protobuf/reflection_ops.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/reflection_ops.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/reflection_ops.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/repeated_field.h b/linux-x86_64/protobuf2.5/include/google/protobuf/repeated_field.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/repeated_field.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/repeated_field.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/service.h b/linux-x86_64/protobuf2.5/include/google/protobuf/service.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/service.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/service.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_gcc.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_gcc.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_gcc.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_gcc.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_qnx.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_qnx.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_qnx.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_qnx.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_atomicword_compat.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_macosx.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_macosx.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_macosx.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_macosx.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_mips_gcc.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_mips_gcc.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_mips_gcc.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_mips_gcc.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_pnacl.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_pnacl.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_pnacl.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_pnacl.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_gcc.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_gcc.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_gcc.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_gcc.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_msvc.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_msvc.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_msvc.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_msvc.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/common.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/common.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/common.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/common.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/once.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/once.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/once.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/once.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/platform_macros.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/platform_macros.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/platform_macros.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/platform_macros.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/template_util.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/template_util.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/template_util.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/template_util.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/type_traits.h b/linux-x86_64/protobuf2.5/include/google/protobuf/stubs/type_traits.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/stubs/type_traits.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/stubs/type_traits.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/text_format.h b/linux-x86_64/protobuf2.5/include/google/protobuf/text_format.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/text_format.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/text_format.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/unknown_field_set.h b/linux-x86_64/protobuf2.5/include/google/protobuf/unknown_field_set.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/unknown_field_set.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/unknown_field_set.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/wire_format.h b/linux-x86_64/protobuf2.5/include/google/protobuf/wire_format.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/wire_format.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/wire_format.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/wire_format_lite.h b/linux-x86_64/protobuf2.5/include/google/protobuf/wire_format_lite.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/wire_format_lite.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/wire_format_lite.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/wire_format_lite_inl.h b/linux-x86_64/protobuf2.5/include/google/protobuf/wire_format_lite_inl.h
similarity index 100%
rename from linux-x86/protobuf2.5/include/google/protobuf/wire_format_lite_inl.h
rename to linux-x86_64/protobuf2.5/include/google/protobuf/wire_format_lite_inl.h
diff --git a/linux-x86/protobuf2.5/lib/libprotobuf-lite.a b/linux-x86_64/protobuf2.5/lib/libprotobuf-lite.a
similarity index 79%
rename from linux-x86/protobuf2.5/lib/libprotobuf-lite.a
rename to linux-x86_64/protobuf2.5/lib/libprotobuf-lite.a
index 69f8cf3..d39a61a 100644
--- a/linux-x86/protobuf2.5/lib/libprotobuf-lite.a
+++ b/linux-x86_64/protobuf2.5/lib/libprotobuf-lite.a
Binary files differ
diff --git a/linux-x86/protobuf2.5/lib/libprotobuf-lite.la b/linux-x86_64/protobuf2.5/lib/libprotobuf-lite.la
similarity index 90%
rename from linux-x86/protobuf2.5/lib/libprotobuf-lite.la
rename to linux-x86_64/protobuf2.5/lib/libprotobuf-lite.la
index 164d25d..0fe4845 100755
--- a/linux-x86/protobuf2.5/lib/libprotobuf-lite.la
+++ b/linux-x86_64/protobuf2.5/lib/libprotobuf-lite.la
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/mangini/ub-gearhead-engine-dev/out/bin/linux/protobuf2.5/lib'
+libdir='/usr/local/google/src/android/ub-gearhead-engine-dev/prebuilts/misc/linux-x86_64/protobuf2.5/lib'
diff --git a/linux-x86/protobuf2.5/lib/libprotobuf-lite.so b/linux-x86_64/protobuf2.5/lib/libprotobuf-lite.so
similarity index 100%
rename from linux-x86/protobuf2.5/lib/libprotobuf-lite.so
rename to linux-x86_64/protobuf2.5/lib/libprotobuf-lite.so
diff --git a/linux-x86/protobuf2.5/lib/libprotobuf-lite.so.8 b/linux-x86_64/protobuf2.5/lib/libprotobuf-lite.so.8
similarity index 100%
rename from linux-x86/protobuf2.5/lib/libprotobuf-lite.so.8
rename to linux-x86_64/protobuf2.5/lib/libprotobuf-lite.so.8
diff --git a/linux-x86_64/protobuf2.5/lib/libprotobuf-lite.so.8.0.0 b/linux-x86_64/protobuf2.5/lib/libprotobuf-lite.so.8.0.0
new file mode 100755
index 0000000..2fb4159
--- /dev/null
+++ b/linux-x86_64/protobuf2.5/lib/libprotobuf-lite.so.8.0.0
Binary files differ
diff --git a/linux-x86/protobuf2.5/lib/libprotobuf.a b/linux-x86_64/protobuf2.5/lib/libprotobuf.a
similarity index 82%
rename from linux-x86/protobuf2.5/lib/libprotobuf.a
rename to linux-x86_64/protobuf2.5/lib/libprotobuf.a
index d61fd8e..128ee61 100644
--- a/linux-x86/protobuf2.5/lib/libprotobuf.a
+++ b/linux-x86_64/protobuf2.5/lib/libprotobuf.a
Binary files differ
diff --git a/linux-x86/protobuf2.5/lib/libprotobuf.la b/linux-x86_64/protobuf2.5/lib/libprotobuf.la
similarity index 89%
rename from linux-x86/protobuf2.5/lib/libprotobuf.la
rename to linux-x86_64/protobuf2.5/lib/libprotobuf.la
index 08623ca..10131e8 100755
--- a/linux-x86/protobuf2.5/lib/libprotobuf.la
+++ b/linux-x86_64/protobuf2.5/lib/libprotobuf.la
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/mangini/ub-gearhead-engine-dev/out/bin/linux/protobuf2.5/lib'
+libdir='/usr/local/google/src/android/ub-gearhead-engine-dev/prebuilts/misc/linux-x86_64/protobuf2.5/lib'
diff --git a/linux-x86/protobuf2.5/lib/libprotobuf.so b/linux-x86_64/protobuf2.5/lib/libprotobuf.so
similarity index 100%
rename from linux-x86/protobuf2.5/lib/libprotobuf.so
rename to linux-x86_64/protobuf2.5/lib/libprotobuf.so
diff --git a/linux-x86/protobuf2.5/lib/libprotobuf.so.8 b/linux-x86_64/protobuf2.5/lib/libprotobuf.so.8
similarity index 100%
rename from linux-x86/protobuf2.5/lib/libprotobuf.so.8
rename to linux-x86_64/protobuf2.5/lib/libprotobuf.so.8
diff --git a/linux-x86/protobuf2.5/lib/libprotobuf.so.8.0.0 b/linux-x86_64/protobuf2.5/lib/libprotobuf.so.8.0.0
similarity index 64%
rename from linux-x86/protobuf2.5/lib/libprotobuf.so.8.0.0
rename to linux-x86_64/protobuf2.5/lib/libprotobuf.so.8.0.0
index 0abe77c..aeaa3c9 100755
--- a/linux-x86/protobuf2.5/lib/libprotobuf.so.8.0.0
+++ b/linux-x86_64/protobuf2.5/lib/libprotobuf.so.8.0.0
Binary files differ
diff --git a/linux-x86/protobuf2.5/lib/libprotoc.a b/linux-x86_64/protobuf2.5/lib/libprotoc.a
similarity index 85%
rename from linux-x86/protobuf2.5/lib/libprotoc.a
rename to linux-x86_64/protobuf2.5/lib/libprotoc.a
index e09d949..7503c79 100644
--- a/linux-x86/protobuf2.5/lib/libprotoc.a
+++ b/linux-x86_64/protobuf2.5/lib/libprotoc.a
Binary files differ
diff --git a/linux-x86/protobuf2.5/lib/libprotoc.la b/linux-x86_64/protobuf2.5/lib/libprotoc.la
similarity index 78%
rename from linux-x86/protobuf2.5/lib/libprotoc.la
rename to linux-x86_64/protobuf2.5/lib/libprotoc.la
index 4c7594d..54b0da0 100755
--- a/linux-x86/protobuf2.5/lib/libprotoc.la
+++ b/linux-x86_64/protobuf2.5/lib/libprotoc.la
@@ -17,7 +17,7 @@
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' /usr/local/google/home/mangini/ub-gearhead-engine-dev/out/bin/linux/protobuf2.5/lib/libprotobuf.la -lpthread -lz'
+dependency_libs=' /usr/local/google/src/android/ub-gearhead-engine-dev/prebuilts/misc/linux-x86_64/protobuf2.5/lib/libprotobuf.la -lpthread -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/mangini/ub-gearhead-engine-dev/out/bin/linux/protobuf2.5/lib'
+libdir='/usr/local/google/src/android/ub-gearhead-engine-dev/prebuilts/misc/linux-x86_64/protobuf2.5/lib'
diff --git a/linux-x86/protobuf2.5/lib/libprotoc.so b/linux-x86_64/protobuf2.5/lib/libprotoc.so
similarity index 100%
rename from linux-x86/protobuf2.5/lib/libprotoc.so
rename to linux-x86_64/protobuf2.5/lib/libprotoc.so
diff --git a/linux-x86/protobuf2.5/lib/libprotoc.so.8 b/linux-x86_64/protobuf2.5/lib/libprotoc.so.8
similarity index 100%
rename from linux-x86/protobuf2.5/lib/libprotoc.so.8
rename to linux-x86_64/protobuf2.5/lib/libprotoc.so.8
diff --git a/linux-x86/protobuf2.5/lib/libprotoc.so.8.0.0 b/linux-x86_64/protobuf2.5/lib/libprotoc.so.8.0.0
similarity index 76%
rename from linux-x86/protobuf2.5/lib/libprotoc.so.8.0.0
rename to linux-x86_64/protobuf2.5/lib/libprotoc.so.8.0.0
index 5c1153d..d02f267 100755
--- a/linux-x86/protobuf2.5/lib/libprotoc.so.8.0.0
+++ b/linux-x86_64/protobuf2.5/lib/libprotoc.so.8.0.0
Binary files differ
diff --git a/linux-x86/protobuf2.5/lib/pkgconfig/protobuf-lite.pc b/linux-x86_64/protobuf2.5/lib/pkgconfig/protobuf-lite.pc
similarity index 79%
rename from linux-x86/protobuf2.5/lib/pkgconfig/protobuf-lite.pc
rename to linux-x86_64/protobuf2.5/lib/pkgconfig/protobuf-lite.pc
index 919f61c..9cc9652 100644
--- a/linux-x86/protobuf2.5/lib/pkgconfig/protobuf-lite.pc
+++ b/linux-x86_64/protobuf2.5/lib/pkgconfig/protobuf-lite.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/mangini/ub-gearhead-engine-dev/out/bin/linux/protobuf2.5
+prefix=/usr/local/google/src/android/ub-gearhead-engine-dev/prebuilts/misc/linux-x86_64/protobuf2.5
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/linux-x86/protobuf2.5/lib/pkgconfig/protobuf.pc b/linux-x86_64/protobuf2.5/lib/pkgconfig/protobuf.pc
similarity index 79%
rename from linux-x86/protobuf2.5/lib/pkgconfig/protobuf.pc
rename to linux-x86_64/protobuf2.5/lib/pkgconfig/protobuf.pc
index 6caeb48..b9e1636 100644
--- a/linux-x86/protobuf2.5/lib/pkgconfig/protobuf.pc
+++ b/linux-x86_64/protobuf2.5/lib/pkgconfig/protobuf.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/mangini/ub-gearhead-engine-dev/out/bin/linux/protobuf2.5
+prefix=/usr/local/google/src/android/ub-gearhead-engine-dev/prebuilts/misc/linux-x86_64/protobuf2.5
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
diff --git a/linux-x86/protobuf2.5/MODULE_LICENSE_APACHE2 b/windows/protobuf2.5/MODULE_LICENSE_APACHE2
similarity index 100%
copy from linux-x86/protobuf2.5/MODULE_LICENSE_APACHE2
copy to windows/protobuf2.5/MODULE_LICENSE_APACHE2
diff --git a/windows/protobuf2.5/PREBUILT b/windows/protobuf2.5/PREBUILT
new file mode 100644
index 0000000..412f464
--- /dev/null
+++ b/windows/protobuf2.5/PREBUILT
@@ -0,0 +1,6 @@
+The binaries in this prebuilt directory can be rebuilt using
+the source in external/protobuf2.5
+
+cd external/protobuf2.5
+./configure --host=i686-w64-mingw32 --with-protoc=protoc --prefix=path/to/prebuilts/misc/windows/protobuf2.5
+make && make install
diff --git a/windows/protobuf2.5/bin/libprotobuf-8.dll b/windows/protobuf2.5/bin/libprotobuf-8.dll
new file mode 100755
index 0000000..2d2a8e9
--- /dev/null
+++ b/windows/protobuf2.5/bin/libprotobuf-8.dll
Binary files differ
diff --git a/windows/protobuf2.5/bin/libprotobuf-lite-8.dll b/windows/protobuf2.5/bin/libprotobuf-lite-8.dll
new file mode 100755
index 0000000..fcf6484
--- /dev/null
+++ b/windows/protobuf2.5/bin/libprotobuf-lite-8.dll
Binary files differ
diff --git a/windows/protobuf2.5/bin/libprotoc-8.dll b/windows/protobuf2.5/bin/libprotoc-8.dll
new file mode 100755
index 0000000..db987c3
--- /dev/null
+++ b/windows/protobuf2.5/bin/libprotoc-8.dll
Binary files differ
diff --git a/windows/protobuf2.5/bin/protoc.exe b/windows/protobuf2.5/bin/protoc.exe
new file mode 100755
index 0000000..8fab653
--- /dev/null
+++ b/windows/protobuf2.5/bin/protoc.exe
Binary files differ
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/code_generator.h b/windows/protobuf2.5/include/google/protobuf/compiler/code_generator.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/compiler/code_generator.h
copy to windows/protobuf2.5/include/google/protobuf/compiler/code_generator.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/command_line_interface.h b/windows/protobuf2.5/include/google/protobuf/compiler/command_line_interface.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/compiler/command_line_interface.h
copy to windows/protobuf2.5/include/google/protobuf/compiler/command_line_interface.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/cpp/cpp_generator.h b/windows/protobuf2.5/include/google/protobuf/compiler/cpp/cpp_generator.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/compiler/cpp/cpp_generator.h
copy to windows/protobuf2.5/include/google/protobuf/compiler/cpp/cpp_generator.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/importer.h b/windows/protobuf2.5/include/google/protobuf/compiler/importer.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/compiler/importer.h
copy to windows/protobuf2.5/include/google/protobuf/compiler/importer.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/java/java_generator.h b/windows/protobuf2.5/include/google/protobuf/compiler/java/java_generator.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/compiler/java/java_generator.h
copy to windows/protobuf2.5/include/google/protobuf/compiler/java/java_generator.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/parser.h b/windows/protobuf2.5/include/google/protobuf/compiler/parser.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/compiler/parser.h
copy to windows/protobuf2.5/include/google/protobuf/compiler/parser.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/plugin.h b/windows/protobuf2.5/include/google/protobuf/compiler/plugin.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/compiler/plugin.h
copy to windows/protobuf2.5/include/google/protobuf/compiler/plugin.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/plugin.pb.h b/windows/protobuf2.5/include/google/protobuf/compiler/plugin.pb.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/compiler/plugin.pb.h
copy to windows/protobuf2.5/include/google/protobuf/compiler/plugin.pb.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/plugin.proto b/windows/protobuf2.5/include/google/protobuf/compiler/plugin.proto
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/compiler/plugin.proto
copy to windows/protobuf2.5/include/google/protobuf/compiler/plugin.proto
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/compiler/python/python_generator.h b/windows/protobuf2.5/include/google/protobuf/compiler/python/python_generator.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/compiler/python/python_generator.h
copy to windows/protobuf2.5/include/google/protobuf/compiler/python/python_generator.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/descriptor.h b/windows/protobuf2.5/include/google/protobuf/descriptor.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/descriptor.h
copy to windows/protobuf2.5/include/google/protobuf/descriptor.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/descriptor.pb.h b/windows/protobuf2.5/include/google/protobuf/descriptor.pb.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/descriptor.pb.h
copy to windows/protobuf2.5/include/google/protobuf/descriptor.pb.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/descriptor.proto b/windows/protobuf2.5/include/google/protobuf/descriptor.proto
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/descriptor.proto
copy to windows/protobuf2.5/include/google/protobuf/descriptor.proto
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/descriptor_database.h b/windows/protobuf2.5/include/google/protobuf/descriptor_database.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/descriptor_database.h
copy to windows/protobuf2.5/include/google/protobuf/descriptor_database.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/dynamic_message.h b/windows/protobuf2.5/include/google/protobuf/dynamic_message.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/dynamic_message.h
copy to windows/protobuf2.5/include/google/protobuf/dynamic_message.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/extension_set.h b/windows/protobuf2.5/include/google/protobuf/extension_set.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/extension_set.h
copy to windows/protobuf2.5/include/google/protobuf/extension_set.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/generated_enum_reflection.h b/windows/protobuf2.5/include/google/protobuf/generated_enum_reflection.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/generated_enum_reflection.h
copy to windows/protobuf2.5/include/google/protobuf/generated_enum_reflection.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/generated_message_reflection.h b/windows/protobuf2.5/include/google/protobuf/generated_message_reflection.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/generated_message_reflection.h
copy to windows/protobuf2.5/include/google/protobuf/generated_message_reflection.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/generated_message_util.h b/windows/protobuf2.5/include/google/protobuf/generated_message_util.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/generated_message_util.h
copy to windows/protobuf2.5/include/google/protobuf/generated_message_util.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/coded_stream.h b/windows/protobuf2.5/include/google/protobuf/io/coded_stream.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/io/coded_stream.h
copy to windows/protobuf2.5/include/google/protobuf/io/coded_stream.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/printer.h b/windows/protobuf2.5/include/google/protobuf/io/printer.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/io/printer.h
copy to windows/protobuf2.5/include/google/protobuf/io/printer.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/tokenizer.h b/windows/protobuf2.5/include/google/protobuf/io/tokenizer.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/io/tokenizer.h
copy to windows/protobuf2.5/include/google/protobuf/io/tokenizer.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/zero_copy_stream.h b/windows/protobuf2.5/include/google/protobuf/io/zero_copy_stream.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/io/zero_copy_stream.h
copy to windows/protobuf2.5/include/google/protobuf/io/zero_copy_stream.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl.h b/windows/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl.h
copy to windows/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl_lite.h b/windows/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl_lite.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl_lite.h
copy to windows/protobuf2.5/include/google/protobuf/io/zero_copy_stream_impl_lite.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/message.h b/windows/protobuf2.5/include/google/protobuf/message.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/message.h
copy to windows/protobuf2.5/include/google/protobuf/message.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/message_lite.h b/windows/protobuf2.5/include/google/protobuf/message_lite.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/message_lite.h
copy to windows/protobuf2.5/include/google/protobuf/message_lite.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/reflection_ops.h b/windows/protobuf2.5/include/google/protobuf/reflection_ops.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/reflection_ops.h
copy to windows/protobuf2.5/include/google/protobuf/reflection_ops.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/repeated_field.h b/windows/protobuf2.5/include/google/protobuf/repeated_field.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/repeated_field.h
copy to windows/protobuf2.5/include/google/protobuf/repeated_field.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/service.h b/windows/protobuf2.5/include/google/protobuf/service.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/service.h
copy to windows/protobuf2.5/include/google/protobuf/service.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops.h b/windows/protobuf2.5/include/google/protobuf/stubs/atomicops.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/atomicops.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_gcc.h b/windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_gcc.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_gcc.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_gcc.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_qnx.h b/windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_qnx.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_qnx.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_arm_qnx.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_atomicword_compat.h b/windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_macosx.h b/windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_macosx.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_macosx.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_macosx.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_mips_gcc.h b/windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_mips_gcc.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_mips_gcc.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_mips_gcc.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_pnacl.h b/windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_pnacl.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_pnacl.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_pnacl.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_gcc.h b/windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_gcc.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_gcc.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_gcc.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_msvc.h b/windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_msvc.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_msvc.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/atomicops_internals_x86_msvc.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/common.h b/windows/protobuf2.5/include/google/protobuf/stubs/common.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/common.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/common.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/once.h b/windows/protobuf2.5/include/google/protobuf/stubs/once.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/once.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/once.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/platform_macros.h b/windows/protobuf2.5/include/google/protobuf/stubs/platform_macros.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/platform_macros.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/platform_macros.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/template_util.h b/windows/protobuf2.5/include/google/protobuf/stubs/template_util.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/template_util.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/template_util.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/stubs/type_traits.h b/windows/protobuf2.5/include/google/protobuf/stubs/type_traits.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/stubs/type_traits.h
copy to windows/protobuf2.5/include/google/protobuf/stubs/type_traits.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/text_format.h b/windows/protobuf2.5/include/google/protobuf/text_format.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/text_format.h
copy to windows/protobuf2.5/include/google/protobuf/text_format.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/unknown_field_set.h b/windows/protobuf2.5/include/google/protobuf/unknown_field_set.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/unknown_field_set.h
copy to windows/protobuf2.5/include/google/protobuf/unknown_field_set.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/wire_format.h b/windows/protobuf2.5/include/google/protobuf/wire_format.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/wire_format.h
copy to windows/protobuf2.5/include/google/protobuf/wire_format.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/wire_format_lite.h b/windows/protobuf2.5/include/google/protobuf/wire_format_lite.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/wire_format_lite.h
copy to windows/protobuf2.5/include/google/protobuf/wire_format_lite.h
diff --git a/linux-x86/protobuf2.5/include/google/protobuf/wire_format_lite_inl.h b/windows/protobuf2.5/include/google/protobuf/wire_format_lite_inl.h
similarity index 100%
copy from linux-x86/protobuf2.5/include/google/protobuf/wire_format_lite_inl.h
copy to windows/protobuf2.5/include/google/protobuf/wire_format_lite_inl.h
diff --git a/windows/protobuf2.5/lib/libprotobuf-lite.a b/windows/protobuf2.5/lib/libprotobuf-lite.a
new file mode 100644
index 0000000..4f62968
--- /dev/null
+++ b/windows/protobuf2.5/lib/libprotobuf-lite.a
Binary files differ
diff --git a/windows/protobuf2.5/lib/libprotobuf-lite.dll.a b/windows/protobuf2.5/lib/libprotobuf-lite.dll.a
new file mode 100755
index 0000000..a141870
--- /dev/null
+++ b/windows/protobuf2.5/lib/libprotobuf-lite.dll.a
Binary files differ
diff --git a/linux-x86/protobuf2.5/lib/libprotobuf-lite.la b/windows/protobuf2.5/lib/libprotobuf-lite.la
similarity index 74%
copy from linux-x86/protobuf2.5/lib/libprotobuf-lite.la
copy to windows/protobuf2.5/lib/libprotobuf-lite.la
index 164d25d..8669bdc 100755
--- a/linux-x86/protobuf2.5/lib/libprotobuf-lite.la
+++ b/windows/protobuf2.5/lib/libprotobuf-lite.la
@@ -5,19 +5,19 @@
 # It is necessary for linking the library.
 
 # The name that we can dlopen(3).
-dlname='libprotobuf-lite.so.8'
+dlname='../bin/libprotobuf-lite-8.dll'
 
 # Names of this library.
-library_names='libprotobuf-lite.so.8.0.0 libprotobuf-lite.so.8 libprotobuf-lite.so'
+library_names='libprotobuf-lite.dll.a'
 
 # The name of the static archive.
 old_library='libprotobuf-lite.a'
 
 # Linker flags that can not go in dependency_libs.
-inherited_linker_flags=' -pthread'
+inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -lpthread -lz'
+dependency_libs=''
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/mangini/ub-gearhead-engine-dev/out/bin/linux/protobuf2.5/lib'
+libdir='/usr/local/google/src/android/ub-gearhead-engine-dev/prebuilts/misc/windows/protobuf2.5/lib'
diff --git a/windows/protobuf2.5/lib/libprotobuf.a b/windows/protobuf2.5/lib/libprotobuf.a
new file mode 100644
index 0000000..2bb94fd
--- /dev/null
+++ b/windows/protobuf2.5/lib/libprotobuf.a
Binary files differ
diff --git a/windows/protobuf2.5/lib/libprotobuf.dll.a b/windows/protobuf2.5/lib/libprotobuf.dll.a
new file mode 100755
index 0000000..06640a0
--- /dev/null
+++ b/windows/protobuf2.5/lib/libprotobuf.dll.a
Binary files differ
diff --git a/linux-x86/protobuf2.5/lib/libprotobuf.la b/windows/protobuf2.5/lib/libprotobuf.la
similarity index 75%
copy from linux-x86/protobuf2.5/lib/libprotobuf.la
copy to windows/protobuf2.5/lib/libprotobuf.la
index 08623ca..9de7dd0 100755
--- a/linux-x86/protobuf2.5/lib/libprotobuf.la
+++ b/windows/protobuf2.5/lib/libprotobuf.la
@@ -5,19 +5,19 @@
 # It is necessary for linking the library.
 
 # The name that we can dlopen(3).
-dlname='libprotobuf.so.8'
+dlname='../bin/libprotobuf-8.dll'
 
 # Names of this library.
-library_names='libprotobuf.so.8.0.0 libprotobuf.so.8 libprotobuf.so'
+library_names='libprotobuf.dll.a'
 
 # The name of the static archive.
 old_library='libprotobuf.a'
 
 # Linker flags that can not go in dependency_libs.
-inherited_linker_flags=' -pthread'
+inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -lpthread -lz'
+dependency_libs=''
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/mangini/ub-gearhead-engine-dev/out/bin/linux/protobuf2.5/lib'
+libdir='/usr/local/google/src/android/ub-gearhead-engine-dev/prebuilts/misc/windows/protobuf2.5/lib'
diff --git a/windows/protobuf2.5/lib/libprotoc.a b/windows/protobuf2.5/lib/libprotoc.a
new file mode 100644
index 0000000..c5b25b5
--- /dev/null
+++ b/windows/protobuf2.5/lib/libprotoc.a
Binary files differ
diff --git a/windows/protobuf2.5/lib/libprotoc.dll.a b/windows/protobuf2.5/lib/libprotoc.dll.a
new file mode 100755
index 0000000..a2069f7
--- /dev/null
+++ b/windows/protobuf2.5/lib/libprotoc.dll.a
Binary files differ
diff --git a/linux-x86/protobuf2.5/lib/libprotoc.la b/windows/protobuf2.5/lib/libprotoc.la
similarity index 69%
copy from linux-x86/protobuf2.5/lib/libprotoc.la
copy to windows/protobuf2.5/lib/libprotoc.la
index 4c7594d..43849ed 100755
--- a/linux-x86/protobuf2.5/lib/libprotoc.la
+++ b/windows/protobuf2.5/lib/libprotoc.la
@@ -5,19 +5,19 @@
 # It is necessary for linking the library.
 
 # The name that we can dlopen(3).
-dlname='libprotoc.so.8'
+dlname='../bin/libprotoc-8.dll'
 
 # Names of this library.
-library_names='libprotoc.so.8.0.0 libprotoc.so.8 libprotoc.so'
+library_names='libprotoc.dll.a'
 
 # The name of the static archive.
 old_library='libprotoc.a'
 
 # Linker flags that can not go in dependency_libs.
-inherited_linker_flags=' -pthread'
+inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' /usr/local/google/home/mangini/ub-gearhead-engine-dev/out/bin/linux/protobuf2.5/lib/libprotobuf.la -lpthread -lz'
+dependency_libs=' /usr/local/google/src/android/ub-gearhead-engine-dev/prebuilts/misc/windows/protobuf2.5/lib/libprotobuf.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/local/google/home/mangini/ub-gearhead-engine-dev/out/bin/linux/protobuf2.5/lib'
+libdir='/usr/local/google/src/android/ub-gearhead-engine-dev/prebuilts/misc/windows/protobuf2.5/lib'
diff --git a/linux-x86/protobuf2.5/lib/pkgconfig/protobuf-lite.pc b/windows/protobuf2.5/lib/pkgconfig/protobuf-lite.pc
similarity index 62%
copy from linux-x86/protobuf2.5/lib/pkgconfig/protobuf-lite.pc
copy to windows/protobuf2.5/lib/pkgconfig/protobuf-lite.pc
index 919f61c..53e04b8 100644
--- a/linux-x86/protobuf2.5/lib/pkgconfig/protobuf-lite.pc
+++ b/windows/protobuf2.5/lib/pkgconfig/protobuf-lite.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/mangini/ub-gearhead-engine-dev/out/bin/linux/protobuf2.5
+prefix=/usr/local/google/src/android/ub-gearhead-engine-dev/prebuilts/misc/windows/protobuf2.5
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
@@ -6,8 +6,8 @@
 Name: Protocol Buffers
 Description: Google's Data Interchange Format
 Version: 2.5.0
-Libs: -L${libdir} -lprotobuf-lite -pthread  -lpthread
-Cflags: -I${includedir} -pthread
+Libs: -L${libdir} -lprotobuf-lite  
+Cflags: -I${includedir} 
 # Commented out because it crashes pkg-config *sigh*:
 #   http://bugs.freedesktop.org/show_bug.cgi?id=13265
 # Conflicts: protobuf
diff --git a/linux-x86/protobuf2.5/lib/pkgconfig/protobuf.pc b/windows/protobuf2.5/lib/pkgconfig/protobuf.pc
similarity index 61%
copy from linux-x86/protobuf2.5/lib/pkgconfig/protobuf.pc
copy to windows/protobuf2.5/lib/pkgconfig/protobuf.pc
index 6caeb48..6fcdbb5 100644
--- a/linux-x86/protobuf2.5/lib/pkgconfig/protobuf.pc
+++ b/windows/protobuf2.5/lib/pkgconfig/protobuf.pc
@@ -1,4 +1,4 @@
-prefix=/usr/local/google/home/mangini/ub-gearhead-engine-dev/out/bin/linux/protobuf2.5
+prefix=/usr/local/google/src/android/ub-gearhead-engine-dev/prebuilts/misc/windows/protobuf2.5
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
@@ -6,9 +6,9 @@
 Name: Protocol Buffers
 Description: Google's Data Interchange Format
 Version: 2.5.0
-Libs: -L${libdir} -lprotobuf -pthread  -lpthread
-Libs.private: -lz 
-Cflags: -I${includedir} -pthread
+Libs: -L${libdir} -lprotobuf  
+Libs.private: 
+Cflags: -I${includedir} 
 # Commented out because it crashes pkg-config *sigh*:
 #   http://bugs.freedesktop.org/show_bug.cgi?id=13265
 # Conflicts: protobuf-lite