Decouple Ant task for protobuf from the main Ant task (part 2)

This is a follow up CL for r416, which should have included android/protobuf/protobuf.gyp.

BUG=none
TEST=compile

git-svn-id: https://mozc.googlecode.com/svn/trunk@417 a6090854-d499-a067-5803-1114d4e51264

src/android/protobuf/protobuf.gyp

diff --git a/src/android/protobuf/protobuf.gyp b/src/android/protobuf/protobuf.gyp
new file mode 100644
index 0000000..aae9025
--- /dev/null
+++ b/src/android/protobuf/protobuf.gyp
@@ -0,0 +1,56 @@
+# Copyright 2010-2014, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+{
+  'targets': [
+    {
+      'target_name': 'protobuf_java',
+      'type': 'none',
+      'dependencies': [
+        '../genproto_java.gyp:sdk_genproto_java',
+      ],
+      'actions': [
+        {
+          'action_name': 'build_protobuf',
+          'inputs': [
+            'AndroidManifest.xml',
+            'ant.properties',
+            'build.xml',
+            'project.properties',
+          ],
+          'outputs': [
+            'bin/classes.jar',
+            'gen/com/google/userfeedback/android/api/R.java',
+          ],
+          'includes': ['../ant.gypi'],
+        },
+      ],
+    },
+  ],
+}

src/mozc_version_template.txt

diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index c6ec7c3..b2ca90c 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=16
-BUILD=1957
+BUILD=1958
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.