Merge "Parse unknown enum values like full proto2."
diff --git a/Android.mk b/Android.mk
index 8baffc2..f615fd6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -477,6 +477,27 @@
include $(BUILD_HOST_SHARED_LIBRARY)
+# C++ full library + rtti for the platform.
+# =======================================================
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libprotobuf-cpp-full-rtti
+LOCAL_MODULE_TAGS := optional
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_SRC_FILES := $(protobuf_cc_full_src_files)
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/android \
+ external/zlib \
+ $(LOCAL_PATH)/src
+
+LOCAL_RTTI_FLAG := -frtti
+LOCAL_CFLAGS := $(IGNORED_WARNINGS)
+LOCAL_SHARED_LIBRARIES := libz
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src
+
+include $(BUILD_SHARED_LIBRARY)
+
# C++ full library + rtti for the host.
# =======================================================
include $(CLEAR_VARS)
diff --git a/README.version b/README.version
new file mode 100644
index 0000000..e92bd5d
--- /dev/null
+++ b/README.version
@@ -0,0 +1,3 @@
+URL: https://protobuf.googlecode.com/svn/rc/protobuf-2.6.0.tar.gz
+Version: 2.6.0
+BugComponent: 99142
