From a3b2a6da25a76f17c73d31def3952feb0fd2296e Mon Sep 17 00:00:00 2001 From: Jeff Davidson Date: Mon, 15 Sep 2014 16:29:06 -0700 Subject: Update protobuf library from 2.3 to 2.6. Copied in all files from the open source protobuf project at commit edc5994525c79cd1919859a370837a6ff7c8e308, removing files which have been renamed (COPYING.txt -> LICENSE, README.txt -> README.md). Removed 2.3 prebuilts, which is an approach that will not work due to incompatibility with the 2.6 runtime. Merged in micro/nano-specific changes in the following files: -Android.mk - updated list of C++/Java sources, bumped versions -java/README.txt - merged in micro/nano instructions, bumped versions -java/pom.xml - merged in micro/nano build rules, set packaging to jar -src/Makefile.am - merged in references to micro/nano generators -src/google/protobuf/compiler/javamicro/javamicro_file.h - imported google/protobuf/compiler/code_generator.h and removed redundant OutputDirectory class. -src/google/protobuf/compiler/javanano/javanano_file.h - same -Replaced instances of vector with std::vector as needed to get libprotobuf-cpp-full to compile. Plan to upstream this fix per discussion with protobuf maintainers. Reran autogen.sh to update ./configure and associated scripts. Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48 --- Android.mk | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 18bdd09..609d5a3 100644 --- a/Android.mk +++ b/Android.mk @@ -16,15 +16,18 @@ LOCAL_PATH := $(call my-dir) -IGNORED_WARNINGS := -Wno-sign-compare -Wno-unused-parameter -Wno-sign-promo +IGNORED_WARNINGS := -Wno-sign-compare -Wno-unused-parameter -Wno-sign-promo -Wno-error=return-type CC_LITE_SRC_FILES := \ + src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc \ + src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc \ src/google/protobuf/stubs/common.cc \ src/google/protobuf/stubs/once.cc \ - src/google/protobuf/stubs/hash.cc \ src/google/protobuf/stubs/hash.h \ - src/google/protobuf/stubs/map-util.h \ - src/google/protobuf/stubs/stl_util-inl.h \ + src/google/protobuf/stubs/map_util.h \ + src/google/protobuf/stubs/shared_ptr.h \ + src/google/protobuf/stubs/stringprintf.cc \ + src/google/protobuf/stubs/stringprintf.h \ src/google/protobuf/extension_set.cc \ src/google/protobuf/generated_message_util.cc \ src/google/protobuf/message_lite.cc \ @@ -44,10 +47,24 @@ JAVA_LITE_SRC_FILES := \ java/src/main/java/com/google/protobuf/CodedInputStream.java \ java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java \ java/src/main/java/com/google/protobuf/AbstractMessageLite.java \ + java/src/main/java/com/google/protobuf/AbstractParser.java \ java/src/main/java/com/google/protobuf/FieldSet.java \ java/src/main/java/com/google/protobuf/Internal.java \ java/src/main/java/com/google/protobuf/WireFormat.java \ - java/src/main/java/com/google/protobuf/GeneratedMessageLite.java + java/src/main/java/com/google/protobuf/GeneratedMessageLite.java \ + java/src/main/java/com/google/protobuf/BoundedByteString.java \ + java/src/main/java/com/google/protobuf/LazyField.java \ + java/src/main/java/com/google/protobuf/LazyFieldLite.java \ + java/src/main/java/com/google/protobuf/LazyStringList.java \ + java/src/main/java/com/google/protobuf/LazyStringArrayList.java \ + java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java \ + java/src/main/java/com/google/protobuf/LiteralByteString.java \ + java/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java \ + java/src/main/java/com/google/protobuf/Parser.java \ + java/src/main/java/com/google/protobuf/ProtocolStringList.java \ + java/src/main/java/com/google/protobuf/RopeByteString.java \ + java/src/main/java/com/google/protobuf/SmallSortedMap.java \ + java/src/main/java/com/google/protobuf/Utf8.java COMPILER_SRC_FILES := \ src/google/protobuf/descriptor.cc \ @@ -88,17 +105,24 @@ COMPILER_SRC_FILES := \ src/google/protobuf/compiler/cpp/cpp_primitive_field.cc \ src/google/protobuf/compiler/cpp/cpp_service.cc \ src/google/protobuf/compiler/cpp/cpp_string_field.cc \ + src/google/protobuf/compiler/java/java_context.cc \ src/google/protobuf/compiler/java/java_enum.cc \ src/google/protobuf/compiler/java/java_enum_field.cc \ src/google/protobuf/compiler/java/java_extension.cc \ src/google/protobuf/compiler/java/java_field.cc \ src/google/protobuf/compiler/java/java_file.cc \ src/google/protobuf/compiler/java/java_generator.cc \ + src/google/protobuf/compiler/java/java_generator_factory.cc \ src/google/protobuf/compiler/java/java_helpers.cc \ + src/google/protobuf/compiler/java/java_lazy_message_field.cc \ src/google/protobuf/compiler/java/java_message.cc \ src/google/protobuf/compiler/java/java_message_field.cc \ + src/google/protobuf/compiler/java/java_name_resolver.cc \ src/google/protobuf/compiler/java/java_primitive_field.cc \ + src/google/protobuf/compiler/java/java_shared_code_generator.cc \ src/google/protobuf/compiler/java/java_service.cc \ + src/google/protobuf/compiler/java/java_string_field.cc \ + src/google/protobuf/compiler/java/java_doc_comment.cc \ src/google/protobuf/compiler/javamicro/javamicro_enum.cc \ src/google/protobuf/compiler/javamicro/javamicro_enum_field.cc \ src/google/protobuf/compiler/javamicro/javamicro_field.cc \ @@ -122,16 +146,19 @@ COMPILER_SRC_FILES := \ src/google/protobuf/io/coded_stream.cc \ src/google/protobuf/io/gzip_stream.cc \ src/google/protobuf/io/printer.cc \ + src/google/protobuf/io/strtod.cc \ src/google/protobuf/io/tokenizer.cc \ src/google/protobuf/io/zero_copy_stream.cc \ src/google/protobuf/io/zero_copy_stream_impl.cc \ src/google/protobuf/io/zero_copy_stream_impl_lite.cc \ + src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc \ + src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc \ src/google/protobuf/stubs/common.cc \ - src/google/protobuf/stubs/hash.cc \ src/google/protobuf/stubs/once.cc \ src/google/protobuf/stubs/structurally_valid.cc \ src/google/protobuf/stubs/strutil.cc \ - src/google/protobuf/stubs/substitute.cc + src/google/protobuf/stubs/substitute.cc \ + src/google/protobuf/stubs/stringprintf.cc # Java nano library (for device-side users) # ======================================================= @@ -186,7 +213,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libprotobuf-java-lite LOCAL_MODULE_TAGS := optional -LOCAL_SDK_VERSION := 8 +LOCAL_SDK_VERSION := 9 LOCAL_SRC_FILES := $(JAVA_LITE_SRC_FILES) @@ -285,6 +312,7 @@ protobuf_cc_full_src_files := \ src/google/protobuf/wire_format.cc \ src/google/protobuf/io/gzip_stream.cc \ src/google/protobuf/io/printer.cc \ + src/google/protobuf/io/strtod.cc \ src/google/protobuf/io/tokenizer.cc \ src/google/protobuf/io/zero_copy_stream_impl.cc \ src/google/protobuf/compiler/importer.cc \ @@ -482,5 +510,3 @@ LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) -# 2.3.0 prebuilts for backwards compatibility. -include $(LOCAL_PATH)/prebuilts/Android.mk -- cgit v1.1