commit ab8d07a638b9faaf331c91ac1e9ec45debd11623
author Hiroyuki Komatsu <komatsu@google.com> Sun Jan 25 06:48:00 2015 +0000
committer Yohei Yukawa <yukawa@google.com> Sun Jan 25 06:48:00 2015 +0000
tree 72f0a733b3ed2f0359d309a32fea00f3f20749b0
parent fb60620071024ba9398e1b4aab41090b555e0cbe

Fix build failur of unit tests when libcxx is used on Android

When libcxx is used to biuld Mozc for Android, building gtest fails due to the ambiguity of wcsstr function.

This CL specifies _WCHAR_H_CPLUSPLUS_98_CONFORMANCE_ macro to work around.

BUG=none
TEST=compile

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

src/gyp/common.gypi

diff --git a/src/gyp/common.gypi b/src/gyp/common.gypi
index a08f183..1443458 100644
--- a/src/gyp/common.gypi
+++ b/src/gyp/common.gypi
@@ -360,6 +360,8 @@
               ['_toolset=="target"', {
                 'defines': [
                   'OS_ANDROID',
+                  # For the ambiguity of wcsstr.
+                  '_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_',
                   'MOZC_ANDROID_APPLICATION_ID="<(android_application_id)"',
                 ],
                 'cflags': [

src/mozc_version_template.txt

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