Bump Pepper SDK version from 28 to 40
We should update the target Pepper SDK because Pepper 28 SDK, on which currently Mozc depends, was deprecated. Even worse, Pepper 28 SDK is no longer downloadable from Peppre SDK tool.
With this CL, the target Pepper SDK version is bumped from 28 to 40. For Android, Windows, Mac, and Linux desktop platforms, no behavior change is intended. For NaCl build, no user visible change is intended.
BUG=none
TEST=none
git-svn-id: https://mozc.googlecode.com/svn/trunk@554 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/base/base.gyp b/src/base/base.gyp
index 80ec490..cc102f1 100644
--- a/src/base/base.gyp
+++ b/src/base/base.gyp
@@ -99,6 +99,13 @@
'crash_report_handler.cc',
'process.cc',
],
+ # TODO(hsumita): Move this link settings to more suitable position.
+ 'link_settings': {
+ 'libraries': [
+ '-lppapi',
+ '-lppapi_cpp',
+ ],
+ },
}],
],
},
diff --git a/src/build_mozc.py b/src/build_mozc.py
index 5b940d7..263c6cd 100644
--- a/src/build_mozc.py
+++ b/src/build_mozc.py
@@ -927,7 +927,7 @@
nacl_sdk_root = os.path.abspath(options.nacl_sdk_root)
else:
nacl_sdk_root = os.path.abspath(os.path.join(GetAdditionalThirdPartyDir(),
- 'nacl_sdk', 'pepper_27'))
+ 'nacl_sdk', 'pepper_40'))
if not os.path.isdir(nacl_sdk_root):
PrintErrorAndExit('The nacl_sdk_root directory (%s) does not exist.'
% options.nacl_sdk_root)
diff --git a/src/chrome/nacl/nacl_extension.gyp b/src/chrome/nacl/nacl_extension.gyp
index 1254613..ea48e64 100644
--- a/src/chrome/nacl/nacl_extension.gyp
+++ b/src/chrome/nacl/nacl_extension.gyp
@@ -57,12 +57,34 @@
'<(gen_out_dir)/nacl_mozc/options.css',
'<(gen_out_dir)/nacl_mozc/options.html',
'<(gen_out_dir)/nacl_mozc/options.js',
- '<(gen_out_dir)/nacl_mozc/config',
- '<(gen_out_dir)/nacl_mozc/images',
+ '<(gen_out_dir)/nacl_mozc/inputview/config/jp.js',
+ '<(gen_out_dir)/nacl_mozc/inputview/config/us.js',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/backspace.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/compact.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/down.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/enter.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/error.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/globe.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/hide_candidates.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/hidekeyboard.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/hide.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/keydots.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/left.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/modifier-hold.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/modifier-off.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/modifier-on.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/regular_size.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/right.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/setting.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/shift.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/show_candidates.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/tab.png',
+ '<(gen_out_dir)/nacl_mozc/inputview/images/up.png',
'<(gen_out_dir)/nacl_mozc/inputview.html',
'<(gen_out_dir)/nacl_mozc/inputview.js',
'<(gen_out_dir)/nacl_mozc/inputview_css.css',
- '<(gen_out_dir)/nacl_mozc/inputview_layouts',
+ '<(gen_out_dir)/nacl_mozc/inputview/inputview_layouts/101kbd.js',
+ '<(gen_out_dir)/nacl_mozc/inputview/inputview_layouts/compactkbd.js',
],
'partial_supported_messages': [
'<(gen_out_dir)/nacl_mozc/_locales/am/messages.json',
@@ -145,9 +167,6 @@
'sources': [
'nacl_session_handler.cc',
],
- 'link_settings': {
- 'libraries': ['-lppapi', '-lppapi_cpp'],
- },
'dependencies': [
'dictionary_downloader',
'../../base/base.gyp:base',
@@ -177,9 +196,6 @@
'../../base/base.gyp:base',
'../../net/net.gyp:http_client',
],
- 'link_settings': {
- 'libraries': ['-lppapi', '-lppapi_cpp'],
- },
},
{
'target_name': 'url_loader_util',
@@ -190,9 +206,6 @@
'dependencies': [
'../../base/base.gyp:base',
],
- 'link_settings': {
- 'libraries': ['-lppapi', '-lppapi_cpp'],
- },
},
{
'target_name': 'gather_nacl_net_test_files',
@@ -250,9 +263,6 @@
'../../base/file_util_test.cc',
'nacl_net_test_module.cc',
],
- 'link_settings': {
- 'libraries': ['-lppapi', '-lppapi_cpp'],
- },
'dependencies': [
'dictionary_downloader',
'../../base/base.gyp:base',
@@ -374,47 +384,86 @@
{
'target_name': 'gather_nacl_mozc_files',
'type': 'none',
- 'copies': [{
- 'destination': '<(gen_out_dir)/nacl_mozc',
- 'files': [
- '../../data/images/product_icon_32bpp-128.png',
- '../../data/installer/credits_en.html',
- '../../data/installer/credits_ja.html',
- '<(gen_out_dir)/manifest.json',
- '<(gen_out_dir)/nacl_mozc_version.js',
- '<(PRODUCT_DIR)/nacl_session_handler_x86_32.nexe',
- '<(PRODUCT_DIR)/nacl_session_handler_x86_64.nexe',
- '<(PRODUCT_DIR)/nacl_session_handler_arm.nexe',
- 'dictionary_tool.js',
- 'key_translator.js',
- 'nacl_mozc.html',
- 'nacl_mozc.js',
- 'nacl_mozc_init.js',
- 'nacl_session_handler.nmf',
- 'option_page.js',
- 'options.css',
- 'options.html',
- 'options.js',
- 'inputview/config',
- 'inputview/images',
- 'inputview/inputview.html',
- 'inputview/inputview.js',
- 'inputview/inputview_css.css',
- 'inputview/inputview_layouts',
- ],
- 'conditions': [
- ['branding=="GoogleJapaneseInput"', {
- 'files': [
- '<(SHARED_INTERMEDIATE_DIR)/data_manager/packed/zipped_data_chromeos',
- ],
- }],
- ['branding=="Mozc"', {
- 'files': [
- '<(SHARED_INTERMEDIATE_DIR)/data_manager/packed/zipped_data_oss',
- ],
- }],
- ],
- }],
+ 'copies': [
+ {
+ 'destination': '<(gen_out_dir)/nacl_mozc',
+ 'files': [
+ '../../data/images/product_icon_32bpp-128.png',
+ '../../data/installer/credits_en.html',
+ '../../data/installer/credits_ja.html',
+ '<(gen_out_dir)/manifest.json',
+ '<(gen_out_dir)/nacl_mozc_version.js',
+ '<(PRODUCT_DIR)/nacl_session_handler_x86_32.nexe',
+ '<(PRODUCT_DIR)/nacl_session_handler_x86_64.nexe',
+ '<(PRODUCT_DIR)/nacl_session_handler_arm.nexe',
+ 'dictionary_tool.js',
+ 'key_translator.js',
+ 'nacl_mozc.html',
+ 'nacl_mozc.js',
+ 'nacl_mozc_init.js',
+ 'nacl_session_handler.nmf',
+ 'option_page.js',
+ 'options.css',
+ 'options.html',
+ 'options.js',
+ 'inputview/inputview.html',
+ 'inputview/inputview.js',
+ 'inputview/inputview_css.css',
+ ],
+ 'conditions': [
+ ['branding=="GoogleJapaneseInput"', {
+ 'files': [
+ '<(SHARED_INTERMEDIATE_DIR)/data_manager/packed/zipped_data_chromeos',
+ ],
+ }],
+ ['branding=="Mozc"', {
+ 'files': [
+ '<(SHARED_INTERMEDIATE_DIR)/data_manager/packed/zipped_data_oss',
+ ],
+ }],
+ ],
+ },
+ {
+ 'destination': '<(gen_out_dir)/nacl_mozc/inputview/config',
+ 'files': [
+ 'inputview/config/jp.js',
+ 'inputview/config/us.js',
+ ],
+ },
+ {
+ 'destination': '<(gen_out_dir)/nacl_mozc/inputview/images',
+ 'files': [
+ 'inputview/images/backspace.png',
+ 'inputview/images/compact.png',
+ 'inputview/images/down.png',
+ 'inputview/images/enter.png',
+ 'inputview/images/error.png',
+ 'inputview/images/globe.png',
+ 'inputview/images/hide_candidates.png',
+ 'inputview/images/hidekeyboard.png',
+ 'inputview/images/hide.png',
+ 'inputview/images/keydots.png',
+ 'inputview/images/left.png',
+ 'inputview/images/modifier-hold.png',
+ 'inputview/images/modifier-off.png',
+ 'inputview/images/modifier-on.png',
+ 'inputview/images/regular_size.png',
+ 'inputview/images/right.png',
+ 'inputview/images/setting.png',
+ 'inputview/images/shift.png',
+ 'inputview/images/show_candidates.png',
+ 'inputview/images/tab.png',
+ 'inputview/images/up.png',
+ ],
+ },
+ {
+ 'destination': '<(gen_out_dir)/nacl_mozc/inputview/inputview_layouts',
+ 'files': [
+ 'inputview/inputview_layouts/101kbd.js',
+ 'inputview/inputview_layouts/compactkbd.js',
+ ],
+ },
+ ],
},
{
'target_name': 'gen_manifest_and_messages',
diff --git a/src/chrome/nacl/pnacl_translate.gypi b/src/chrome/nacl/pnacl_translate.gypi
index 81bb606..a049947 100644
--- a/src/chrome/nacl/pnacl_translate.gypi
+++ b/src/chrome/nacl/pnacl_translate.gypi
@@ -43,7 +43,7 @@
],
'action': [
'python', 'pnacl_translate.py',
- '--toolchain_root=<(nacl_sdk_root)/toolchain/linux_x86_pnacl',
+ '--toolchain_root=<(nacl_sdk_root)/toolchain/linux_pnacl',
'--input=<(RULE_INPUT_PATH)',
'--output_base=<(PRODUCT_DIR)/<(RULE_INPUT_ROOT)',
'--configuration=<(CONFIGURATION_NAME)',
diff --git a/src/chrome/nacl/pnacl_translate.py b/src/chrome/nacl/pnacl_translate.py
index 96f460c..e4008d1 100644
--- a/src/chrome/nacl/pnacl_translate.py
+++ b/src/chrome/nacl/pnacl_translate.py
@@ -34,7 +34,7 @@
The following command generates stripped nexefile_arm.nexe and
nexefile_x86_32.nexe and nexefile_x86_64.nexe.
- python pnacl_translate.py --command=/path/to/toolchain/linux_x86_pnacl \
+ python pnacl_translate.py --command=/path/to/toolchain/linux_pnacl \
--input=/path/to/pexefile --output_base=/path/to/nexefile \
--configuration=Release
"""
@@ -50,11 +50,10 @@
def Translate(toolchain_root, input_file, output_base):
"""Translates the input file for three architectures."""
targets = (('arm', 'arm'), ('x86-32', 'x86_32'), ('x86-64', 'x86_64'))
- translate_command = os.path.join(toolchain_root,
- 'newlib/bin64/pnacl-translate')
+ translate_command = os.path.join(toolchain_root, 'bin/pnacl-translate')
for target in targets:
- cmd = (translate_command, '-arch', target[0], input_file,
- '-o', '%s_%s.nexe' % (output_base, target[1]))
+ cmd = (translate_command, '--allow-llvm-bitcode-input', '-arch', target[0],
+ input_file, '-o', '%s_%s.nexe' % (output_base, target[1]))
print 'Running: ' + ' '.join(cmd)
if subprocess.Popen(cmd).wait() != 0:
print >> sys.stderr, 'ERROR: ' + ' '.join(cmd)
@@ -64,9 +63,7 @@
def StripAndTranslate(toolchain_root, input_file, output_base):
"""Strips and translates the input file for three architectures."""
- strip_command = os.path.join(toolchain_root, 'newlib/bin64/pnacl-strip')
- arm_strip_command = os.path.join(toolchain_root,
- 'host_x86_64/bin/arm-pc-nacl-strip')
+ strip_command = os.path.join(toolchain_root, 'bin/pnacl-strip')
try:
temp_dir = tempfile.mkdtemp()
temp_file_base = os.path.join(temp_dir, 'stripped')
@@ -77,12 +74,10 @@
raise RuntimeError('Strip Error')
print 'Done: ' + ' '.join(cmd)
Translate(toolchain_root, temp_file_base, temp_file_base)
- targets = ((arm_strip_command, 'arm'),
- (strip_command, 'x86_32'),
- (strip_command, 'x86_64'))
+ targets = ('arm', 'x86_32', 'x86_64')
for target in targets:
- cmd = (target[0], '%s_%s.nexe' % (temp_file_base, target[1]),
- '-o', '%s_%s.nexe' % (output_base, target[1]))
+ cmd = (strip_command, '%s_%s.nexe' % (temp_file_base, target),
+ '-o', '%s_%s.nexe' % (output_base, target))
print 'Running: ' + ' '.join(cmd)
if subprocess.Popen(cmd).wait() != 0:
print >> sys.stderr, 'ERROR: ' + ' '.join(cmd)
diff --git a/src/docker/ubuntu14.04/Dockerfile b/src/docker/ubuntu14.04/Dockerfile
index e99c31e..c10dc5c 100644
--- a/src/docker/ubuntu14.04/Dockerfile
+++ b/src/docker/ubuntu14.04/Dockerfile
@@ -66,8 +66,8 @@
## NaCl SDK
RUN curl -LO http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip && unzip nacl_sdk.zip && rm nacl_sdk.zip
-RUN cd nacl_sdk && ./naclsdk install pepper_27
-ENV NACL_SDK_ROOT /home/mozc_builder/work/nacl_sdk/pepper_27
+RUN cd nacl_sdk && ./naclsdk install pepper_40
+ENV NACL_SDK_ROOT /home/mozc_builder/work/nacl_sdk/pepper_40
## depot_tools
RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
diff --git a/src/gyp/common.gypi b/src/gyp/common.gypi
index 459ebae..1848263 100644
--- a/src/gyp/common.gypi
+++ b/src/gyp/common.gypi
@@ -154,7 +154,7 @@
}],
['target_platform=="NaCl"', {
'compiler_target': 'clang',
- 'compiler_target_version_int': 303, # Clang 3.3 or higher
+ 'compiler_target_version_int': 304, # Clang 3.3 or higher
'compiler_host': 'clang',
'compiler_host_version_int': 304, # Clang 3.4 or higher
}],
@@ -381,6 +381,16 @@
}],
],
}],
+ ['target_platform=="NaCl"', {
+ 'target_conditions' : [
+ ['_toolset=="target"', {
+ 'defines': [
+ # For the ambiguity of wcsstr.
+ '_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_',
+ ],
+ }],
+ ],
+ }],
['enable_mode_indicator==1', {
'defines': ['MOZC_ENABLE_MODE_INDICATOR'],
}],
@@ -527,6 +537,11 @@
}],
],
}],
+ ['target_platform=="NaCl"', {
+ 'ldflags': [
+ '-L<(nacl_sdk_root)/lib/pnacl/Debug',
+ ],
+ }],
],
},
'Release_Base': {
@@ -579,6 +594,11 @@
'<@(release_extra_cflags)',
],
}],
+ ['target_platform=="NaCl"', {
+ 'ldflags': [
+ '-L<(nacl_sdk_root)/lib/pnacl/Release',
+ ],
+ }],
],
},
#
@@ -783,10 +803,11 @@
],
}],
['_toolset=="target" and _type=="static_library"', {
- # PNaCl's artools.py doesn't support thin archive file.
- # (crbug/165096)
+ # PNaCl's artools.py doesn't handle some thin archive files
+ # correctly. (crbug/463026)
# But GYP creates thin archive files for static_library.
# To avoid this issue we turn on this flag.
+ # TODO(hsumita): Remove this hack when the bug in SDK is fixed.
'standalone_static_library': 1,
}],
]
@@ -844,8 +865,7 @@
'conditions': [
['target_platform=="NaCl"', {
'variables': {
- 'pnacl_bin_dir%':
- '<(nacl_sdk_root)/toolchain/linux_x86_pnacl/newlib/bin',
+ 'pnacl_bin_dir%': '<(nacl_sdk_root)/toolchain/linux_pnacl/bin',
},
'make_global_settings': [
['AR', '<(pnacl_bin_dir)/pnacl-ar'],
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 7f84cbf..d13d361 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=16
-BUILD=2070
+BUILD=2071
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.
diff --git a/src/testing/base/internal/gtest_main.cc b/src/testing/base/internal/gtest_main.cc
index 7dd8c18..c593655 100644
--- a/src/testing/base/internal/gtest_main.cc
+++ b/src/testing/base/internal/gtest_main.cc
@@ -34,6 +34,7 @@
#ifdef __native_client__
#include "base/pepper_file_system_mock.h"
#include "base/pepper_file_util.h"
+#include "base/public/nacl_mock_module.h"
#endif // __native_client__
int main(int argc, char **argv) {
@@ -53,6 +54,8 @@
testing::GTEST_FLAG(catch_exceptions) = true;
#ifdef __native_client__
+ mozc::testing::WorkAroundEmptyFunctionToAvoidLinkError();
+
// Sets Pepper file system mock.
mozc::PepperFileSystemMock pepper_file_system_mock;
mozc::PepperFileUtil::SetPepperFileSystemInterfaceForTest(
diff --git a/src/testing/base/public/nacl_mock_module.cc b/src/testing/base/public/nacl_mock_module.cc
index b2790c1..389ca6f 100644
--- a/src/testing/base/public/nacl_mock_module.cc
+++ b/src/testing/base/public/nacl_mock_module.cc
@@ -47,6 +47,15 @@
#include "testing/base/public/googletest.h"
#include "testing/base/public/gunit.h"
+namespace mozc {
+namespace testing {
+
+void WorkAroundEmptyFunctionToAvoidLinkError() {
+}
+
+} // namespace testing
+} // namespace mozc
+
namespace pp {
namespace {
@@ -134,36 +143,3 @@
}
} // namespace pp
-
-extern "C" {
-// The following functions are not implemented in NaCl environment.
-// But the gtest library requires these functions in link phase.
-// So We implement these dummy functions.
-
-char *getcwd(char *buf, size_t size) {
- LOG(WARNING) << "dummy getcwd called";
- if (size < 5) {
- errno = ENAMETOOLONG;
- return NULL;
- }
- memcpy(buf, "/tmp", size);
- return buf;
-}
-
-int access(const char *pathname, int mode) {
- LOG(WARNING) << "dummy access called pathname: \"" << pathname
- << "\" mode: " << mode;
- return -1;
-}
-
-int unlink(const char *pathname) {
- LOG(WARNING) << "dummy unlink called pathname: \"" << pathname << "\"";
- return -1;
-}
-
-int mkdir(const char *pathname, mode_t mode) {
- LOG(WARNING) << "dummy mkdir called pathname: \"" << pathname << "\""
- << " mode: " << mode;
- return -1;
-}
-} // extern "C"
diff --git a/src/testing/base/public/nacl_mock_module.h b/src/testing/base/public/nacl_mock_module.h
new file mode 100644
index 0000000..687d9f0
--- /dev/null
+++ b/src/testing/base/public/nacl_mock_module.h
@@ -0,0 +1,49 @@
+// Copyright 2010-2015, 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.
+
+#ifndef MOZC_TESTING_BASE_PUBLIC_NACL_MOCK_MODULE_H_
+#define MOZC_TESTING_BASE_PUBLIC_NACL_MOCK_MODULE_H_
+
+namespace mozc {
+namespace testing {
+
+// This method does nothing, and is just for avoiding link errors.
+//
+// This method should be called in somewhere. Otherwise, the object file
+// generated from this file will be avoided by clang++ since there is no code
+// which uses this module.
+// Actually, pp::CreateModule() in this module is called if NaCl module is
+// loaded on Chrome, so we need to link this module.
+// TODO(hsumita): Remove this workaround.
+void WorkAroundEmptyFunctionToAvoidLinkError();
+
+} // namespace testing
+} // namespace mozc
+
+#endif // MOZC_TESTING_BASE_PUBLIC_NACL_MOCK_MODULE_H_
diff --git a/src/testing/testing.gyp b/src/testing/testing.gyp
index 77b6000..c504335 100644
--- a/src/testing/testing.gyp
+++ b/src/testing/testing.gyp
@@ -41,9 +41,6 @@
'sources': [
'base/public/nacl_mock_module.cc',
],
- 'link_settings': {
- 'libraries': ['-lppapi', '-lppapi_cpp'],
- },
'dependencies': [
'../base/base.gyp:base',
'../net/net.gyp:http_client',
