From 69463b21c8dcc156bcdaf18191d0d8076c5ac93d Mon Sep 17 00:00:00 2001 From: "P.Y. Laligand" Date: Wed, 11 Mar 2015 16:49:21 -0700 Subject: Added a build rule for the full version of the protocol buffer library. Only added a host-side version as the full version is unlikely to be used on the device side. b/19415609 Change-Id: Ibdd1ad589c2becff735a8cc72b7a7e5d89e45d3e --- Android.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Android.mk b/Android.mk index 5dc957c..9b8d0ef 100644 --- a/Android.mk +++ b/Android.mk @@ -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) -- cgit v1.1