Add protobuf-util prebuilt
Add this dependency so that com.google.protobuf.util package can be used
on the platform.
Test: make protobuf-java-host-prebuilt
Change-Id: I0d3f9d42baf7bdedf6bd8cc53f3f2030c3d9c0e2
diff --git a/common/m2/Android.mk b/common/m2/Android.mk
index 27cc9c2..3fe6f8d 100644
--- a/common/m2/Android.mk
+++ b/common/m2/Android.mk
@@ -54,6 +54,9 @@
asm-prebuilt-host-jar:repository/org/ow2/asm/asm/6.0/asm-6.0.jar \
asm-tree-prebuilt-host-jar:repository/org/ow2/asm/asm-tree/6.0/asm-tree-6.0.jar \
asm-util-prebuilt-host-jar:repository/org/ow2/asm/asm-util/6.0/asm-util-6.0.jar \
+ gson-prebuilt-jar:repository/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar \
+ protobuf-java-prebuilt-jar:repository/com/google/protobuf/protobuf-java/3.0.2/protobuf-java-3.0.2.jar \
+ protobuf-java-util-prebuilt-jar:repository/com/google/protobuf/protobuf-java-util/3.0.2/protobuf-java-util-3.0.2.jar \
truth-prebuilt-host-jar:repository/com/google/truth/truth/0.28/truth-0.28.jar
include $(BUILD_HOST_PREBUILT)
@@ -99,3 +102,18 @@
include $(BUILD_HOST_JAVA_LIBRARY)
+###########################################
+# protobuf-java prebuilt
+###########################################
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := protobuf-java-host-prebuilt
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ gson-prebuilt-jar \
+ protobuf-java-prebuilt-jar \
+ protobuf-java-util-prebuilt-jar
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
