Skip to content

P
protobuf
Commit aa677643 authored by Omari Stephens's avatar Omari Stephens
Browse files
Options

Make protobuf usable by host-side java apps 

Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
parent 7d0a2a3c
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 55 deletions
Android.mk
View file @ aa677643
...@@ -17,23 +17,38 @@ ...@@ -17,23 +17,38 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
CC_LITE_SRC_FILES := \ CC_LITE_SRC_FILES := \
src/google/protobuf/stubs/common.cc \ src/google/protobuf/stubs/common.cc \
src/google/protobuf/stubs/once.cc \ src/google/protobuf/stubs/once.cc \
src/google/protobuf/stubs/hash.cc \ src/google/protobuf/stubs/hash.cc \
src/google/protobuf/stubs/hash.h \ src/google/protobuf/stubs/hash.h \
src/google/protobuf/stubs/map-util.h \ src/google/protobuf/stubs/map-util.h \
src/google/protobuf/stubs/stl_util-inl.h \ src/google/protobuf/stubs/stl_util-inl.h \
src/google/protobuf/extension_set.cc \ src/google/protobuf/extension_set.cc \
src/google/protobuf/generated_message_util.cc \ src/google/protobuf/generated_message_util.cc \
src/google/protobuf/message_lite.cc \ src/google/protobuf/message_lite.cc \
src/google/protobuf/repeated_field.cc \ src/google/protobuf/repeated_field.cc \
src/google/protobuf/wire_format_lite.cc \ src/google/protobuf/wire_format_lite.cc \
src/google/protobuf/io/coded_stream.cc \ src/google/protobuf/io/coded_stream.cc \
src/google/protobuf/io/coded_stream_inl.h \ src/google/protobuf/io/coded_stream_inl.h \
src/google/protobuf/io/zero_copy_stream.cc \ src/google/protobuf/io/zero_copy_stream.cc \
src/google/protobuf/io/zero_copy_stream_impl_lite.cc src/google/protobuf/io/zero_copy_stream_impl_lite.cc
# Java micro library 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
# Java micro library (for device-side users)
# ======================================================= # =======================================================
include $(CLEAR_VARS) include $(CLEAR_VARS)
...@@ -43,28 +58,38 @@ LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/pr ...@@ -43,28 +58,38 @@ LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/pr
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)
# Java lite library # 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)
# ======================================================= # =======================================================
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-java-2.3.0-lite LOCAL_MODULE := libprotobuf-java-2.3.0-lite
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := $(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
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)
# 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)
# C++ lite library # C++ lite library
# ======================================================= # =======================================================
include $(CLEAR_VARS) include $(CLEAR_VARS)
...@@ -114,30 +139,30 @@ LOCAL_MODULE := libprotobuf-cpp-2.3.0-full ...@@ -114,30 +139,30 @@ LOCAL_MODULE := libprotobuf-cpp-2.3.0-full
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(CC_LITE_SRC_FILES) \ $(CC_LITE_SRC_FILES) \
src/google/protobuf/stubs/strutil.cc \ src/google/protobuf/stubs/strutil.cc \
src/google/protobuf/stubs/strutil.h \ src/google/protobuf/stubs/strutil.h \
src/google/protobuf/stubs/substitute.cc \ src/google/protobuf/stubs/substitute.cc \
src/google/protobuf/stubs/substitute.h \ src/google/protobuf/stubs/substitute.h \
src/google/protobuf/stubs/structurally_valid.cc \ src/google/protobuf/stubs/structurally_valid.cc \
src/google/protobuf/descriptor.cc \ src/google/protobuf/descriptor.cc \
src/google/protobuf/descriptor.pb.cc \ src/google/protobuf/descriptor.pb.cc \
src/google/protobuf/descriptor_database.cc \ src/google/protobuf/descriptor_database.cc \
src/google/protobuf/dynamic_message.cc \ src/google/protobuf/dynamic_message.cc \
src/google/protobuf/extension_set_heavy.cc \ src/google/protobuf/extension_set_heavy.cc \
src/google/protobuf/generated_message_reflection.cc \ src/google/protobuf/generated_message_reflection.cc \
src/google/protobuf/message.cc \ src/google/protobuf/message.cc \
src/google/protobuf/reflection_ops.cc \ src/google/protobuf/reflection_ops.cc \
src/google/protobuf/service.cc \ src/google/protobuf/service.cc \
src/google/protobuf/text_format.cc \ src/google/protobuf/text_format.cc \
src/google/protobuf/unknown_field_set.cc \ src/google/protobuf/unknown_field_set.cc \
src/google/protobuf/wire_format.cc \ src/google/protobuf/wire_format.cc \
src/google/protobuf/io/gzip_stream.cc \ src/google/protobuf/io/gzip_stream.cc \
src/google/protobuf/io/printer.cc \ src/google/protobuf/io/printer.cc \
src/google/protobuf/io/tokenizer.cc \ src/google/protobuf/io/tokenizer.cc \
src/google/protobuf/io/zero_copy_stream_impl.cc \ src/google/protobuf/io/zero_copy_stream_impl.cc \
src/google/protobuf/compiler/importer.cc \ src/google/protobuf/compiler/importer.cc \
src/google/protobuf/compiler/parser.cc src/google/protobuf/compiler/parser.cc
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/android \ $(LOCAL_PATH)/android \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment