diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/native_client_sdk | |
parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/native_client_sdk')
-rw-r--r-- | chromium/native_client_sdk/native_client_sdk_untrusted.gyp | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/chromium/native_client_sdk/native_client_sdk_untrusted.gyp b/chromium/native_client_sdk/native_client_sdk_untrusted.gyp deleted file mode 100644 index 2cd3dc50e3f..00000000000 --- a/chromium/native_client_sdk/native_client_sdk_untrusted.gyp +++ /dev/null @@ -1,44 +0,0 @@ -# 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': [ - '../ppapi/native_client/native_client.gyp:ppapi_lib', - ], - }, - ], - }], - ], -} |