Several style fixes in GYP files
They are just style fixes. No behavior change in production is intended.
BUG=none
TEST=compile
git-svn-id: https://mozc.googlecode.com/svn/trunk@433 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/android/android.gyp b/src/android/android.gyp
index 4deec39..9943cf8 100644
--- a/src/android/android.gyp
+++ b/src/android/android.gyp
@@ -62,7 +62,7 @@
'action_name': 'build_java_test',
'inputs': ['<(dummy_input_file)'],
'outputs': ['dummy_java_test'],
- # TODO(komatsu): use ant.gypi when the build rule is moved to tests/.
+ # TODO(komatsu): use ant.gypi when the build rule is moved to tests/.
'ninja_use_console': 1,
'action': [
'../build_tools/run_after_chdir.py', 'tests',
@@ -241,7 +241,7 @@
'action': [
# Note that multiple output files cannot be handled
# by copy_file script.
- '<@(copy_file)', '<@(_inputs)', '<(_outputs)',
+ '<@(copy_file)', '<@(_inputs)', '<@(_outputs)',
],
},
],
@@ -267,7 +267,7 @@
'action': [
# Note that multiple output files cannot be handled
# by copy_file script.
- '<@(copy_file)', '<@(_inputs)', '<(_outputs)',
+ '<@(copy_file)', '<@(_inputs)', '<@(_outputs)',
],
},
],
diff --git a/src/android/android_env.gypi b/src/android/android_env.gypi
index 1a6f676..073d8f0 100644
--- a/src/android/android_env.gypi
+++ b/src/android/android_env.gypi
@@ -27,23 +27,6 @@
# (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:
-# install = Installs the apk package into a real device or an emulator.
-# apk = Builds the apk package.
-# run_test = Installs the apk package and runs the Java test suite.
-# run_native_small_test = Builds and runs C++ unit tests (small size).
-# run_native_large_test = Builds and runs C++ unit tests (large size).
-# adt_apk_dependencies = Prepares everything ADT needs.
-#
-# NOTES:
-# The apk package will be the release or debug version depending on -c option
-# of build_mozc.py (Debug or Release).
-#
-# For signing, neither key.store nor key.alias in project.properties is set,
-# and the default debug key is used. You need to set them in local.properties
-# (recommended) or project.properties when you need to sign the package with
-# the release key.
-
{
'variables': {
'app_package_name': '<(android_application_id)',
@@ -76,7 +59,7 @@
},
'conditions': [
['branding=="GoogleJapaneseInput"', {
- }, {
+ }, { # 'branding!="GoogleJapaneseInput"'
'variables': {
# Currently dexmaker* and easymock* properties are not used.
# TODO(matsuzakit): Support Java-side unit test.
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 37247fa..6974088 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=16
-BUILD=1973
+BUILD=1974
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.