diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/native_client_sdk | |
parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/native_client_sdk')
-rw-r--r-- | chromium/native_client_sdk/native_client_sdk_untrusted.gyp | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/chromium/native_client_sdk/native_client_sdk_untrusted.gyp b/chromium/native_client_sdk/native_client_sdk_untrusted.gyp new file mode 100644 index 00000000000..140664f50a7 --- /dev/null +++ b/chromium/native_client_sdk/native_client_sdk_untrusted.gyp @@ -0,0 +1,45 @@ +# Copyright 2013 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', + ], + 'conditions': [ + ['disable_nacl==0 and disable_nacl_untrusted==0', { + 'targets': [ + { + 'target_name': 'nacl_io_untrusted', + 'type': 'none', + 'variables': { + 'nacl_untrusted_build': 1, + 'nlib_target': 'libnacl_io.a', + 'build_newlib': 1, + 'build_pnacl_newlib': 1, + }, + 'include_dirs': [ + '../native_client/src/untrusted/irt', + 'src/libraries', + 'src/libraries/nacl_io/include', + 'src/libraries/third_party/newlib-extras', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + 'src/libraries', + 'src/libraries/nacl_io/include', + 'src/libraries/third_party/newlib-extras', + ], + }, + 'sources': [ + '>!@pymod_do_main(dsc_info -s -l src/libraries/nacl_io nacl_io)', + ], + 'dependencies': [ + '../native_client/tools.gyp:prep_toolchain', + '../ppapi/native_client/native_client.gyp:ppapi_lib', + ], + }, + ], + }], + ], +} |