summaryrefslogtreecommitdiffstats
path: root/third_party/jsoncpp/jsoncpp_nacl.gyp
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 06:43:35 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 06:43:35 +0000
commit5c13171ab2b2c2d507e72c3cc1b293f0da3514c4 (patch)
tree2ec18ac0fc330553fe86d1fd9c487610aa6a459f /third_party/jsoncpp/jsoncpp_nacl.gyp
parentc60c83e6211f89698f4139dd7abe7a52631b2b30 (diff)
downloadchromium_src-5c13171ab2b2c2d507e72c3cc1b293f0da3514c4.zip
chromium_src-5c13171ab2b2c2d507e72c3cc1b293f0da3514c4.tar.gz
chromium_src-5c13171ab2b2c2d507e72c3cc1b293f0da3514c4.tar.bz2
Rename _untrusted targets in third_party to use _nacl suffix
Previously NaCl targets were using _untrusted suffix which makes the purpose of these targets hard to understand. This CL renames some targets in src/third_party. Also removed toolsets field from modp_b64_nacl.gyp Review URL: https://codereview.chromium.org/138673002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/jsoncpp/jsoncpp_nacl.gyp')
-rw-r--r--third_party/jsoncpp/jsoncpp_nacl.gyp34
1 files changed, 34 insertions, 0 deletions
diff --git a/third_party/jsoncpp/jsoncpp_nacl.gyp b/third_party/jsoncpp/jsoncpp_nacl.gyp
new file mode 100644
index 0000000..d60510c
--- /dev/null
+++ b/third_party/jsoncpp/jsoncpp_nacl.gyp
@@ -0,0 +1,34 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+ 'includes': [
+ '../../build/common_untrusted.gypi',
+ 'jsoncpp.gypi',
+ ],
+ 'conditions': [
+ ['disable_nacl==0 and disable_nacl_untrusted==0', {
+ 'targets': [
+ {
+ 'target_name': 'jsoncpp_nacl',
+ 'type': 'none',
+ 'variables': {
+ 'nacl_untrusted_build': 1,
+ 'nlib_target': 'libjsoncpp_nacl.a',
+ 'build_newlib': 1,
+ },
+ 'gcc_compile_flags': [
+ # Turn off optimizations based on strict aliasing
+ # because of the workaround at
+ # overrides/src/lib_json/json_value.cpp:38.
+ '-fno-strict-aliasing',
+ ],
+ 'dependencies': [
+ '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+ ],
+ },
+ ],
+ }],
+ ],
+}