diff options
| author | P.Y. Laligand <pylaligand@google.com> | 2015-03-12 21:38:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-12 21:38:48 +0000 |
| commit | bb555861ba1bbe274c0fdcca8029fb8dffee9914 (patch) | |
| tree | 41a94b4bcab5558345abb3a230da5b048c5d8c20 | |
| parent | 77ba04d15c46251eb63be4548abe754e20c37ddd (diff) | |
| parent | 182e6d054c06f3a8e44cf9a09e14870366fa1190 (diff) | |
| download | external_protobuf-bb555861ba1bbe274c0fdcca8029fb8dffee9914.zip external_protobuf-bb555861ba1bbe274c0fdcca8029fb8dffee9914.tar.gz external_protobuf-bb555861ba1bbe274c0fdcca8029fb8dffee9914.tar.bz2 | |
am 182e6d05: Merge "Added a build rule for the full version of the protocol buffer library."
* commit '182e6d054c06f3a8e44cf9a09e14870366fa1190':
Added a build rule for the full version of the protocol buffer library.
| -rw-r--r-- | Android.mk | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -66,6 +66,12 @@ JAVA_LITE_SRC_FILES := \ java/src/main/java/com/google/protobuf/SmallSortedMap.java \ java/src/main/java/com/google/protobuf/Utf8.java +# This contains more source files than needed for the full version, but the +# additional files should not create any conflict. +JAVA_FULL_SRC_FILES := \ + $(call all-java-files-under, java/src/main/java) \ + src/google/protobuf/descriptor.proto + COMPILER_SRC_FILES := \ src/google/protobuf/descriptor.cc \ src/google/protobuf/descriptor.pb.cc \ @@ -230,6 +236,17 @@ LOCAL_SRC_FILES := $(JAVA_LITE_SRC_FILES) include $(BUILD_HOST_JAVA_LIBRARY) +# Java full library (for host-side users) +# ======================================================= +include $(CLEAR_VARS) + +LOCAL_MODULE := host-libprotobuf-java-full +LOCAL_MODULE_TAGS := optional + +LOCAL_SRC_FILES := $(JAVA_FULL_SRC_FILES) + +include $(BUILD_HOST_JAVA_LIBRARY) + # C++ lite library # ======================================================= include $(CLEAR_VARS) |