Add libprotobuf-java-2.3.0-lite.

Also, have all the libraries follow the same naming convention so
rename com.google.protobuf.micro library to libprotobuf-java-2.3.0-micro.

Change-Id: I7c2a7d883a17f9a6d084ce4cac9601e344e416bf

1 files changed, 23 insertions, 1 deletions

diff --git a/Android.mk b/Android.mk
index ebd495aa..eb4df837 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,12 +20,34 @@ LOCAL_PATH := $(call my-dir)
 # =======================================================
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := com.google.protobuf.micro
+LOCAL_MODULE := libprotobuf-java-2.3.0-micro
 
 LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/micro)
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+# Java lite library
+# =======================================================
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libprotobuf-java-2.3.0-lite
+
+LOCAL_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)
+
 # C++ lite library
 # =======================================================
 include $(CLEAR_VARS)