Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
Protocol Buffers - Google's data interchange format (grpc依赖) https://developers.google.com/protocol-buffers/
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
276 Commits
201 Branches
346 Tags
254 MiB
Tag: Branch: Tree: 05b6a7be8a
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '05b6a7be8a'
${ noResults }
protobuf/Android.mk

443 lines
16 KiB
Raw Normal View History Unescape

Add support for Java micro protobuf's to protobuf-2.2.0a. See README.android for additional information. Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
15 years ago
# Copyright (C) 2009 The Android Open Source Project
The Android specific files prior to adding protobuf 2.2.0a sources. Change-Id: Ib1009c088a3815c9152385e2b764a2c7cd28317e
15 years ago
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
Add support for Java micro protobuf's to protobuf-2.2.0a. See README.android for additional information. Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
15 years ago
#
#
The Android specific files prior to adding protobuf 2.2.0a sources. Change-Id: Ib1009c088a3815c9152385e2b764a2c7cd28317e
15 years ago
LOCAL_PATH := $(call my-dir)
Fix warnings warnings in header files, hide others. Follow upstream where they have any changes in 2.5.0 Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
11 years ago
IGNORED_WARNINGS := -Wno-sign-compare -Wno-unused-parameter -Wno-sign-promo
Add libprotobuf-cpp-2.3.0-full. Add full c++ version of libprotobuf as a static library. Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
15 years ago
CC_LITE_SRC_FILES := \
Make protobuf usable by host-side java apps Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
14 years ago
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/extension_set.cc \
src/google/protobuf/generated_message_util.cc \
src/google/protobuf/message_lite.cc \
src/google/protobuf/repeated_field.cc \
src/google/protobuf/wire_format_lite.cc \
src/google/protobuf/io/coded_stream.cc \
src/google/protobuf/io/coded_stream_inl.h \
src/google/protobuf/io/zero_copy_stream.cc \
src/google/protobuf/io/zero_copy_stream_impl_lite.cc
JAVA_LITE_SRC_FILES := \
java/src/main/java/com/google/protobuf/UninitializedMessageException.java \
java/src/main/java/com/google/protobuf/MessageLite.java \
java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \
java/src/main/java/com/google/protobuf/CodedOutputStream.java \
java/src/main/java/com/google/protobuf/ByteString.java \
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/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
Build the protocol buffer compiler 'protoc'. We need this to generate code for .proto files that have been added to external/chromium (see change I6960c18d). Change-Id: Ic7a78273ee4f066680039d2f724e658a84869621
14 years ago
COMPILER_SRC_FILES := \
src/google/protobuf/descriptor.cc \
src/google/protobuf/descriptor.pb.cc \
src/google/protobuf/descriptor_database.cc \
src/google/protobuf/dynamic_message.cc \
src/google/protobuf/extension_set.cc \
src/google/protobuf/extension_set_heavy.cc \
src/google/protobuf/generated_message_reflection.cc \
src/google/protobuf/generated_message_util.cc \
src/google/protobuf/message.cc \
src/google/protobuf/message_lite.cc \
src/google/protobuf/reflection_ops.cc \
src/google/protobuf/repeated_field.cc \
src/google/protobuf/service.cc \
src/google/protobuf/text_format.cc \
src/google/protobuf/unknown_field_set.cc \
src/google/protobuf/wire_format.cc \
src/google/protobuf/wire_format_lite.cc \
src/google/protobuf/compiler/code_generator.cc \
src/google/protobuf/compiler/command_line_interface.cc \
src/google/protobuf/compiler/importer.cc \
src/google/protobuf/compiler/main.cc \
src/google/protobuf/compiler/parser.cc \
src/google/protobuf/compiler/plugin.cc \
src/google/protobuf/compiler/plugin.pb.cc \
src/google/protobuf/compiler/subprocess.cc \
src/google/protobuf/compiler/zip_writer.cc \
src/google/protobuf/compiler/cpp/cpp_enum.cc \
src/google/protobuf/compiler/cpp/cpp_enum_field.cc \
src/google/protobuf/compiler/cpp/cpp_extension.cc \
src/google/protobuf/compiler/cpp/cpp_field.cc \
src/google/protobuf/compiler/cpp/cpp_file.cc \
src/google/protobuf/compiler/cpp/cpp_generator.cc \
src/google/protobuf/compiler/cpp/cpp_helpers.cc \
src/google/protobuf/compiler/cpp/cpp_message.cc \
src/google/protobuf/compiler/cpp/cpp_message_field.cc \
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_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_helpers.cc \
src/google/protobuf/compiler/java/java_message.cc \
src/google/protobuf/compiler/java/java_message_field.cc \
src/google/protobuf/compiler/java/java_primitive_field.cc \
src/google/protobuf/compiler/java/java_service.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 \
src/google/protobuf/compiler/javamicro/javamicro_file.cc \
src/google/protobuf/compiler/javamicro/javamicro_generator.cc \
src/google/protobuf/compiler/javamicro/javamicro_helpers.cc \
src/google/protobuf/compiler/javamicro/javamicro_message.cc \
src/google/protobuf/compiler/javamicro/javamicro_message_field.cc \
src/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc \
Nano protobufs. Like micro protobufs except: - No setter/getter/hazzer functions. - Has state is not available. Outputs all fields != their default. - CodedInputStream can only take byte[] (not InputStream). - Repeated fields are in arrays, not ArrayList or Vector. - Unset messages/groups are null, not "defaultInstance()". - Required fields are always serialized. To use: - Link libprotobuf-java-2.3.0-nano runtime. - Use LOCAL_PROTOC_OPTIMIZE_TYPE := nano Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
12 years ago
src/google/protobuf/compiler/javanano/javanano_enum.cc \
src/google/protobuf/compiler/javanano/javanano_enum_field.cc \
Nano support for extensions and unknown fields. You can use the processor option store_unknown_fields to switch this support on: aprotoc --javanano_out=store_unknown_fields=true:/tmp/out A separate option for extensions isn't required. Support for unknown fields must be turned on to allow storing and retrieving extensions, because they are just stored as unknown fields. If unknown fields are switched on, extension related code will be generated when a proto message includes an extension range, or an extension is encountered. By default, store_unknown_fields is false. No additional code is generated, and the generator will error out if protos contain extension ranges or extensions. Change-Id: I1e034c9e8f3305612953f72438189a7da6ed2167
12 years ago
src/google/protobuf/compiler/javanano/javanano_extension.cc \
Nano protobufs. Like micro protobufs except: - No setter/getter/hazzer functions. - Has state is not available. Outputs all fields != their default. - CodedInputStream can only take byte[] (not InputStream). - Repeated fields are in arrays, not ArrayList or Vector. - Unset messages/groups are null, not "defaultInstance()". - Required fields are always serialized. To use: - Link libprotobuf-java-2.3.0-nano runtime. - Use LOCAL_PROTOC_OPTIMIZE_TYPE := nano Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
12 years ago
src/google/protobuf/compiler/javanano/javanano_field.cc \
src/google/protobuf/compiler/javanano/javanano_file.cc \
src/google/protobuf/compiler/javanano/javanano_generator.cc \
src/google/protobuf/compiler/javanano/javanano_helpers.cc \
src/google/protobuf/compiler/javanano/javanano_message.cc \
src/google/protobuf/compiler/javanano/javanano_message_field.cc \
src/google/protobuf/compiler/javanano/javanano_primitive_field.cc \
Build the protocol buffer compiler 'protoc'. We need this to generate code for .proto files that have been added to external/chromium (see change I6960c18d). Change-Id: Ic7a78273ee4f066680039d2f724e658a84869621
14 years ago
src/google/protobuf/compiler/python/python_generator.cc \
src/google/protobuf/io/coded_stream.cc \
src/google/protobuf/io/gzip_stream.cc \
src/google/protobuf/io/printer.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/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
Make protobuf usable by host-side java apps Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
14 years ago
Nano protobufs. Like micro protobufs except: - No setter/getter/hazzer functions. - Has state is not available. Outputs all fields != their default. - CodedInputStream can only take byte[] (not InputStream). - Repeated fields are in arrays, not ArrayList or Vector. - Unset messages/groups are null, not "defaultInstance()". - Required fields are always serialized. To use: - Link libprotobuf-java-2.3.0-nano runtime. - Use LOCAL_PROTOC_OPTIMIZE_TYPE := nano Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
12 years ago
# Java nano library (for device-side users)
# =======================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-java-2.3.0-nano
LOCAL_MODULE_TAGS := optional
LOCAL_SDK_VERSION := 8
LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/nano)
Support generation of Parcelable nano messages. This CL adds the "parcelable_messages" option. When enabled, all generated message classes will conform to the Android Parcelable contract. This is achieved by introducing a new parent class for generated classes which implements the required functionality. Since the store_unknown_fields option also makes use of a superclass, ExtendableMessageNano, we have two versions of the new Parcelable superclass: one extending MessageNano, and one extending ExtendableMessageNano. These classes are otherwise identical. As these classes depend on Android framework jars, they are not included in the host .jar build of the nanoproto library. Finally, add a test suite for running tests of Android-specific functionality, as this cannot be done on a desktop JVM. Change-Id: Icc2a257f03317e947f7078dbb9857c3286857497
11 years ago
LOCAL_SRC_FILES += $(call all-java-files-under, java/src/device/main/java/com/google/protobuf/nano)
Nano protobufs. Like micro protobufs except: - No setter/getter/hazzer functions. - Has state is not available. Outputs all fields != their default. - CodedInputStream can only take byte[] (not InputStream). - Repeated fields are in arrays, not ArrayList or Vector. - Unset messages/groups are null, not "defaultInstance()". - Required fields are always serialized. To use: - Link libprotobuf-java-2.3.0-nano runtime. - Use LOCAL_PROTOC_OPTIMIZE_TYPE := nano Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
12 years ago
include $(BUILD_STATIC_JAVA_LIBRARY)
# Java nano library (for host-side users)
# =======================================================
include $(CLEAR_VARS)
LOCAL_MODULE := host-libprotobuf-java-2.3.0-nano
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/nano)
include $(BUILD_HOST_JAVA_LIBRARY)
Make protobuf usable by host-side java apps Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
14 years ago
# Java micro library (for device-side users)
Add libprotobuf-cpp-2.3.0-lite Added android/config.h which will be used to configure android builds of libraries. Currently I've undef HAVE_HASH_MAP and HAVE_HASH_SET as the versions in stlport generated compile errors. Updated .gitignore to be more selective on what it ignores so android/config.h wouldn't be ignored. Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
15 years ago
# =======================================================
include $(CLEAR_VARS)
Add support for Java micro protobuf's to protobuf-2.2.0a. See README.android for additional information. Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
15 years ago
Add libprotobuf-java-2.3.0-lite. Also, have all the libraries follow the same naming convention so rename com.google.protobuf.micro library to libprotobuf-java-2.3.0-micro. Change-Id: I7c2a7d883a17f9a6d084ce4cac9601e344e416bf
15 years ago
LOCAL_MODULE := libprotobuf-java-2.3.0-micro
Make these modules optional. This allows compiling this code in Gingerbread. Bug: 3064326 Change-Id: Idab78a5a31a3c2fc35bcdb773aaecf1e4fb70bcb
14 years ago
LOCAL_MODULE_TAGS := optional
Unbundle protobuffer target libraries. Change-Id: I535f93389b3b13578c9602dce3d38f1ca256e807
14 years ago
LOCAL_SDK_VERSION := 8
Add support for Java micro protobuf's to protobuf-2.2.0a. See README.android for additional information. Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
15 years ago
Add libprotobuf-cpp-2.3.0-lite Added android/config.h which will be used to configure android builds of libraries. Currently I've undef HAVE_HASH_MAP and HAVE_HASH_SET as the versions in stlport generated compile errors. Updated .gitignore to be more selective on what it ignores so android/config.h wouldn't be ignored. Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
15 years ago
LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/micro)
Add support for Java micro protobuf's to protobuf-2.2.0a. See README.android for additional information. Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
15 years ago
include $(BUILD_STATIC_JAVA_LIBRARY)
Add libprotobuf-java-2.3.0-lite. Also, have all the libraries follow the same naming convention so rename com.google.protobuf.micro library to libprotobuf-java-2.3.0-micro. Change-Id: I7c2a7d883a17f9a6d084ce4cac9601e344e416bf
15 years ago
Make protobuf usable by host-side java apps Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
14 years ago
# Java micro library (for host-side users)
# =======================================================
include $(CLEAR_VARS)
LOCAL_MODULE := host-libprotobuf-java-2.3.0-micro
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/micro)
include $(BUILD_HOST_JAVA_LIBRARY)
# Java lite library (for device-side users)
Add libprotobuf-java-2.3.0-lite. Also, have all the libraries follow the same naming convention so rename com.google.protobuf.micro library to libprotobuf-java-2.3.0-micro. Change-Id: I7c2a7d883a17f9a6d084ce4cac9601e344e416bf
15 years ago
# =======================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-java-2.3.0-lite
Make these modules optional. This allows compiling this code in Gingerbread. Bug: 3064326 Change-Id: Idab78a5a31a3c2fc35bcdb773aaecf1e4fb70bcb
14 years ago
LOCAL_MODULE_TAGS := optional
Unbundle protobuffer target libraries. Change-Id: I535f93389b3b13578c9602dce3d38f1ca256e807
14 years ago
LOCAL_SDK_VERSION := 8
Add libprotobuf-java-2.3.0-lite. Also, have all the libraries follow the same naming convention so rename com.google.protobuf.micro library to libprotobuf-java-2.3.0-micro. Change-Id: I7c2a7d883a17f9a6d084ce4cac9601e344e416bf
15 years ago
Make protobuf usable by host-side java apps Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
14 years ago
LOCAL_SRC_FILES := $(JAVA_LITE_SRC_FILES)
Add libprotobuf-java-2.3.0-lite. Also, have all the libraries follow the same naming convention so rename com.google.protobuf.micro library to libprotobuf-java-2.3.0-micro. Change-Id: I7c2a7d883a17f9a6d084ce4cac9601e344e416bf
15 years ago
include $(BUILD_STATIC_JAVA_LIBRARY)
Add libprotobuf-cpp-2.3.0-lite Added android/config.h which will be used to configure android builds of libraries. Currently I've undef HAVE_HASH_MAP and HAVE_HASH_SET as the versions in stlport generated compile errors. Updated .gitignore to be more selective on what it ignores so android/config.h wouldn't be ignored. Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
15 years ago
Make protobuf usable by host-side java apps Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
14 years ago
# Java lite library (for host-side users)
# =======================================================
include $(CLEAR_VARS)
LOCAL_MODULE := host-libprotobuf-java-2.3.0-lite
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(JAVA_LITE_SRC_FILES)
include $(BUILD_HOST_JAVA_LIBRARY)
Add libprotobuf-cpp-2.3.0-lite Added android/config.h which will be used to configure android builds of libraries. Currently I've undef HAVE_HASH_MAP and HAVE_HASH_SET as the versions in stlport generated compile errors. Updated .gitignore to be more selective on what it ignores so android/config.h wouldn't be ignored. Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
15 years ago
# C++ lite library
# =======================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-cpp-2.3.0-lite
Make these modules optional. This allows compiling this code in Gingerbread. Bug: 3064326 Change-Id: Idab78a5a31a3c2fc35bcdb773aaecf1e4fb70bcb
14 years ago
LOCAL_MODULE_TAGS := optional
Add libprotobuf-cpp-2.3.0-lite Added android/config.h which will be used to configure android builds of libraries. Currently I've undef HAVE_HASH_MAP and HAVE_HASH_SET as the versions in stlport generated compile errors. Updated .gitignore to be more selective on what it ignores so android/config.h wouldn't be ignored. Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
15 years ago
LOCAL_CPP_EXTENSION := .cc
Add libprotobuf-cpp-2.3.0-full. Add full c++ version of libprotobuf as a static library. Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
15 years ago
LOCAL_SRC_FILES := $(CC_LITE_SRC_FILES)
Add libprotobuf-cpp-2.3.0-lite Added android/config.h which will be used to configure android builds of libraries. Currently I've undef HAVE_HASH_MAP and HAVE_HASH_SET as the versions in stlport generated compile errors. Updated .gitignore to be more selective on what it ignores so android/config.h wouldn't be ignored. Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
15 years ago
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/android \
$(LOCAL_PATH)/src
# Define the header files to be copied
#LOCAL_COPY_HEADERS := \
# src/google/protobuf/stubs/once.h \
# src/google/protobuf/stubs/common.h \
# src/google/protobuf/io/coded_stream.h \
# src/google/protobuf/generated_message_util.h \
# src/google/protobuf/repeated_field.h \
# src/google/protobuf/extension_set.h \
# src/google/protobuf/wire_format_lite_inl.h
#
#LOCAL_COPY_HEADERS_TO := $(LOCAL_MODULE)
Fix warnings warnings in header files, hide others. Follow upstream where they have any changes in 2.5.0 Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
11 years ago
LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI $(IGNORED_WARNINGS)
Add libprotobuf-cpp-2.3.0-lite Added android/config.h which will be used to configure android builds of libraries. Currently I've undef HAVE_HASH_MAP and HAVE_HASH_SET as the versions in stlport generated compile errors. Updated .gitignore to be more selective on what it ignores so android/config.h wouldn't be ignored. Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
15 years ago
Build the target protobuf libraries against the NDK This change unbundled the protobuf target libraries, so they can be used in unbundled branches. Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
13 years ago
# These are the minimum versions and don't need to be update.
Build against the NDK for x86 and mips too. Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
12 years ago
ifeq ($(TARGET_ARCH),arm)
Build the target protobuf libraries against the NDK This change unbundled the protobuf target libraries, so they can be used in unbundled branches. Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
13 years ago
LOCAL_SDK_VERSION := 8
Retire LOCAL_NDK_VERSION. Bug: 6932421 Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
12 years ago
else
Build against the NDK for x86 and mips too. Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
12 years ago
# x86/mips support only available from API 9.
LOCAL_SDK_VERSION := 9
Build the target protobuf libraries against the NDK This change unbundled the protobuf target libraries, so they can be used in unbundled branches. Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
13 years ago
endif
Build against the NDK for x86 and mips too. Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
12 years ago
LOCAL_NDK_STL_VARIANT := stlport_static
Build the target protobuf libraries against the NDK This change unbundled the protobuf target libraries, so they can be used in unbundled branches. Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
13 years ago
Add libprotobuf-cpp-2.3.0-lite Added android/config.h which will be used to configure android builds of libraries. Currently I've undef HAVE_HASH_MAP and HAVE_HASH_SET as the versions in stlport generated compile errors. Updated .gitignore to be more selective on what it ignores so android/config.h wouldn't be ignored. Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
15 years ago
include $(BUILD_STATIC_LIBRARY)
Add libprotobuf-cpp-2.3.0-full. Add full c++ version of libprotobuf as a static library. Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
15 years ago
# C++ full library
# =======================================================
Add gnustl+rtti version of cpp full library Adding new version of cpp library, 'libprotobuf-cpp-2.3.0-full-gnustl-rtti'. Previously, c++ code compiled against gnustl couldn't link with this library - having both gnustl and stlport in same binary leads to nasty conflicts. Bug: 7484202 Change-Id: Ic4fbbfc2839c4ce88bf605cf3d9cca47b146f965
12 years ago
protobuf_cc_full_src_files := \
Make protobuf usable by host-side java apps Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
14 years ago
$(CC_LITE_SRC_FILES) \
src/google/protobuf/stubs/strutil.cc \
src/google/protobuf/stubs/strutil.h \
src/google/protobuf/stubs/substitute.cc \
src/google/protobuf/stubs/substitute.h \
src/google/protobuf/stubs/structurally_valid.cc \
src/google/protobuf/descriptor.cc \
src/google/protobuf/descriptor.pb.cc \
src/google/protobuf/descriptor_database.cc \
src/google/protobuf/dynamic_message.cc \
src/google/protobuf/extension_set_heavy.cc \
src/google/protobuf/generated_message_reflection.cc \
src/google/protobuf/message.cc \
src/google/protobuf/reflection_ops.cc \
src/google/protobuf/service.cc \
src/google/protobuf/text_format.cc \
src/google/protobuf/unknown_field_set.cc \
src/google/protobuf/wire_format.cc \
src/google/protobuf/io/gzip_stream.cc \
src/google/protobuf/io/printer.cc \
src/google/protobuf/io/tokenizer.cc \
src/google/protobuf/io/zero_copy_stream_impl.cc \
src/google/protobuf/compiler/importer.cc \
src/google/protobuf/compiler/parser.cc
Add libprotobuf-cpp-2.3.0-full. Add full c++ version of libprotobuf as a static library. Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
15 years ago
Add gnustl+rtti version of cpp full library Adding new version of cpp library, 'libprotobuf-cpp-2.3.0-full-gnustl-rtti'. Previously, c++ code compiled against gnustl couldn't link with this library - having both gnustl and stlport in same binary leads to nasty conflicts. Bug: 7484202 Change-Id: Ic4fbbfc2839c4ce88bf605cf3d9cca47b146f965
12 years ago
# C++ full library - stlport version
# =======================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-cpp-2.3.0-full
LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := $(protobuf_cc_full_src_files)
Add libprotobuf-cpp-2.3.0-full. Add full c++ version of libprotobuf as a static library. Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
15 years ago
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/android \
external/zlib \
$(LOCAL_PATH)/src
# Define the header files to be copied
#LOCAL_COPY_HEADERS := \
# src/google/protobuf/stubs/once.h \
# src/google/protobuf/stubs/common.h \
# src/google/protobuf/io/coded_stream.h \
# src/google/protobuf/generated_message_util.h \
# src/google/protobuf/repeated_field.h \
# src/google/protobuf/extension_set.h \
# src/google/protobuf/wire_format_lite_inl.h
#
#LOCAL_COPY_HEADERS_TO := $(LOCAL_MODULE)
Fix warnings warnings in header files, hide others. Follow upstream where they have any changes in 2.5.0 Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
11 years ago
LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI $(IGNORED_WARNINGS)
Add libprotobuf-cpp-2.3.0-full. Add full c++ version of libprotobuf as a static library. Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
15 years ago
Build the target protobuf libraries against the NDK This change unbundled the protobuf target libraries, so they can be used in unbundled branches. Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
13 years ago
# These are the minimum versions and don't need to be update.
Build against the NDK for x86 and mips too. Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
12 years ago
ifeq ($(TARGET_ARCH),arm)
Build the target protobuf libraries against the NDK This change unbundled the protobuf target libraries, so they can be used in unbundled branches. Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
13 years ago
LOCAL_SDK_VERSION := 8
Retire LOCAL_NDK_VERSION. Bug: 6932421 Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
12 years ago
else
Build against the NDK for x86 and mips too. Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
12 years ago
# x86/mips support only available from API 9.
LOCAL_SDK_VERSION := 9
Build the target protobuf libraries against the NDK This change unbundled the protobuf target libraries, so they can be used in unbundled branches. Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
13 years ago
endif
Build against the NDK for x86 and mips too. Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
12 years ago
LOCAL_NDK_STL_VARIANT := stlport_static
Build the target protobuf libraries against the NDK This change unbundled the protobuf target libraries, so they can be used in unbundled branches. Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
13 years ago
Add libprotobuf-cpp-2.3.0-full. Add full c++ version of libprotobuf as a static library. Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
15 years ago
include $(BUILD_STATIC_LIBRARY)
Build the protocol buffer compiler 'protoc'. We need this to generate code for .proto files that have been added to external/chromium (see change I6960c18d). Change-Id: Ic7a78273ee4f066680039d2f724e658a84869621
14 years ago
Add gnustl+rtti version of cpp full library Adding new version of cpp library, 'libprotobuf-cpp-2.3.0-full-gnustl-rtti'. Previously, c++ code compiled against gnustl couldn't link with this library - having both gnustl and stlport in same binary leads to nasty conflicts. Bug: 7484202 Change-Id: Ic4fbbfc2839c4ce88bf605cf3d9cca47b146f965
12 years ago
# C++ full library - Gnustl+rtti version
# =======================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-cpp-2.3.0-full-gnustl-rtti
LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := $(protobuf_cc_full_src_files)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/android \
external/zlib \
$(LOCAL_PATH)/src
Fix warnings warnings in header files, hide others. Follow upstream where they have any changes in 2.5.0 Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
11 years ago
LOCAL_CFLAGS := -frtti $(IGNORED_WARNINGS)
Add gnustl+rtti version of cpp full library Adding new version of cpp library, 'libprotobuf-cpp-2.3.0-full-gnustl-rtti'. Previously, c++ code compiled against gnustl couldn't link with this library - having both gnustl and stlport in same binary leads to nasty conflicts. Bug: 7484202 Change-Id: Ic4fbbfc2839c4ce88bf605cf3d9cca47b146f965
12 years ago
LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := gnustl_static
include $(BUILD_STATIC_LIBRARY)
# Clean temp vars
protobuf_cc_full_src_files :=
Rename protoc to aprotoc. With gLucid protoc is installed in the base system, by renaming our version there will be no confusion about which compiler is being used. Change-Id: I975e29e4444af9467c9b9600d5a2e7027f4046ae
14 years ago
# Android Protocol buffer compiler, aprotoc (host executable)
# used by the build systems as $(PROTOC) defined in
# build/core/config.mk
Build the protocol buffer compiler 'protoc'. We need this to generate code for .proto files that have been added to external/chromium (see change I6960c18d). Change-Id: Ic7a78273ee4f066680039d2f724e658a84869621
14 years ago
# =======================================================
include $(CLEAR_VARS)
Rename protoc to aprotoc. With gLucid protoc is installed in the base system, by renaming our version there will be no confusion about which compiler is being used. Change-Id: I975e29e4444af9467c9b9600d5a2e7027f4046ae
14 years ago
LOCAL_MODULE := aprotoc
Build the protocol buffer compiler 'protoc'. We need this to generate code for .proto files that have been added to external/chromium (see change I6960c18d). Change-Id: Ic7a78273ee4f066680039d2f724e658a84869621
14 years ago
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := $(COMPILER_SRC_FILES)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/android \
$(LOCAL_PATH)/src
LOCAL_STATIC_LIBRARIES += libz
LOCAL_LDLIBS := -lpthread
Fix warnings warnings in header files, hide others. Follow upstream where they have any changes in 2.5.0 Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
11 years ago
LOCAL_CFLAGS := $(IGNORED_WARNINGS)
Build the protocol buffer compiler 'protoc'. We need this to generate code for .proto files that have been added to external/chromium (see change I6960c18d). Change-Id: Ic7a78273ee4f066680039d2f724e658a84869621
14 years ago
include $(BUILD_HOST_EXECUTABLE)
Add test for passing in proto params. Depends on Ia532647fe8811d39230a23ba3671685b0388cbe0 Change-Id: I0ba3ce3561aff31e246968a79b1d1053dec91d49
12 years ago
# To test java proto params build rules.
# =======================================================
include $(CLEAR_VARS)
LOCAL_MODULE := aprotoc-test-nano-params
LOCAL_MODULE_TAGS := tests
LOCAL_SDK_VERSION := current
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_SRC_FILES := \
src/google/protobuf/unittest_import_nano.proto \
src/google/protobuf/unittest_simple_nano.proto \
src/google/protobuf/unittest_stringutf8_nano.proto \
Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto. Change-Id: I2dad2fd9f6c3d419fa77cf8162cd1ee49f74cc5d
11 years ago
src/google/protobuf/unittest_recursive_nano.proto
Add test for passing in proto params. Depends on Ia532647fe8811d39230a23ba3671685b0388cbe0 Change-Id: I0ba3ce3561aff31e246968a79b1d1053dec91d49
12 years ago
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/src
Allow whitespace in nano codegen options. So we don't need to keep all option in a single line in the .mk files. Change-Id: I786b879b334cac4cd13b32fabcb76efe53b4ac80
11 years ago
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := \
java_package = $(LOCAL_PATH)/src/google/protobuf/unittest_import_nano.proto|com.google.protobuf.nano, \
java_outer_classname = $(LOCAL_PATH)/src/google/protobuf/unittest_import_nano.proto|UnittestImportNano
Add test for passing in proto params. Depends on Ia532647fe8811d39230a23ba3671685b0388cbe0 Change-Id: I0ba3ce3561aff31e246968a79b1d1053dec91d49
12 years ago
include $(BUILD_STATIC_JAVA_LIBRARY)
Support generation of Parcelable nano messages. This CL adds the "parcelable_messages" option. When enabled, all generated message classes will conform to the Android Parcelable contract. This is achieved by introducing a new parent class for generated classes which implements the required functionality. Since the store_unknown_fields option also makes use of a superclass, ExtendableMessageNano, we have two versions of the new Parcelable superclass: one extending MessageNano, and one extending ExtendableMessageNano. These classes are otherwise identical. As these classes depend on Android framework jars, they are not included in the host .jar build of the nanoproto library. Finally, add a test suite for running tests of Android-specific functionality, as this cannot be done on a desktop JVM. Change-Id: Icc2a257f03317e947f7078dbb9857c3286857497
11 years ago
# To test Android-specific nanoproto features.
# =======================================================
include $(CLEAR_VARS)
# Parcelable messages
LOCAL_MODULE := android-nano-test-parcelable
LOCAL_MODULE_TAGS := tests
LOCAL_SDK_VERSION := current
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_SRC_FILES := src/google/protobuf/unittest_simple_nano.proto
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/src
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := \
parcelable_messages = true
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS)
# Parcelable and extendable messages
LOCAL_MODULE := android-nano-test-parcelable-extendable
LOCAL_MODULE_TAGS := tests
LOCAL_SDK_VERSION := current
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_SRC_FILES := src/google/protobuf/unittest_extension_nano.proto
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/src
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := \
parcelable_messages = true, \
store_unknown_fields = true
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS)
# Test APK
LOCAL_PACKAGE_NAME := NanoAndroidTest
LOCAL_SDK_VERSION := 8
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, java/src/device/test/java/com/google/protobuf/nano)
LOCAL_MANIFEST_FILE := java/src/device/test/AndroidManifest.xml
LOCAL_STATIC_JAVA_LIBRARIES := libprotobuf-java-2.3.0-nano \
android-nano-test-parcelable \
android-nano-test-parcelable-extendable
WITH_DEXPREOPT := false
include $(BUILD_PACKAGE)