diff options
| author | Wink Saville <wink@google.com> | 2013-04-01 18:05:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-01 18:05:23 -0700 |
| commit | b296a1e50943209b62ab96043eca698281d98a28 (patch) | |
| tree | 39d59e77bcc4404c35bbf44bce84396c38bed664 /Android.mk | |
| parent | adeccdc18128424a6879bc45b60be90a2e0ca104 (diff) | |
| parent | 216c9e8681b9426e84c9e2222da5c0dd669261b2 (diff) | |
| download | external_protobuf-b296a1e50943209b62ab96043eca698281d98a28.zip external_protobuf-b296a1e50943209b62ab96043eca698281d98a28.tar.gz external_protobuf-b296a1e50943209b62ab96043eca698281d98a28.tar.bz2 | |
am 216c9e86: Merge "Nano protobufs."
* commit '216c9e8681b9426e84c9e2222da5c0dd669261b2':
Nano protobufs.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 32 |
1 files changed, 32 insertions, 0 deletions
@@ -106,6 +106,15 @@ COMPILER_SRC_FILES := \ 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 \ + src/google/protobuf/compiler/javanano/javanano_enum.cc \ + src/google/protobuf/compiler/javanano/javanano_enum_field.cc \ + 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 \ src/google/protobuf/compiler/python/python_generator.cc \ src/google/protobuf/io/coded_stream.cc \ src/google/protobuf/io/gzip_stream.cc \ @@ -121,6 +130,29 @@ COMPILER_SRC_FILES := \ src/google/protobuf/stubs/strutil.cc \ src/google/protobuf/stubs/substitute.cc +# 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) + +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) + # Java micro library (for device-side users) # ======================================================= include $(CLEAR_VARS) |