commit c5b5fa75649f3ce948ddab7b846b9aee319d6d19
author Hiroyuki Komatsu <komatsu@google.com> Mon Dec 08 04:35:13 2014 +0000
committer Yohei Yukawa <yukawa@google.com> Mon Dec 08 04:35:13 2014 +0000
tree c19356fd571076553226a60a1cb01d6a170a5be8
parent 9592b0b669684878a6459f138fe0332edb68f04c

Do not require libzinnia-dev when building Mozc for Android or NaCl

Neither Mozc for Android nor Mozc for NaCl has depended on Zinnia.  Hence we should always turn Zinnia off so that we can build Mozc for those platforms without libzinnia-dev.

BUG=none
TEST=build Android Mozc on Linux

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

src/build_mozc.py

diff --git a/src/build_mozc.py b/src/build_mozc.py
index 59d45ac..9374d3f 100644
--- a/src/build_mozc.py
+++ b/src/build_mozc.py
@@ -869,7 +869,7 @@
   else:
     gyp_options.extend(['-D', 'use_dynamically_linked_qt=0'])
 
-  if options.use_zinnia:
+  if options.use_zinnia and target_platform not in ['Android', 'NaCl']:
     gyp_options.extend(['-D', 'use_zinnia=YES'])
   else:
     gyp_options.extend(['-D', 'use_zinnia=NO'])

src/mozc_version_template.txt

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