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/third_party/fips181 | |
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/third_party/fips181')
-rw-r--r-- | chromium/third_party/fips181/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/third_party/fips181/fips181.gyp | 33 |
2 files changed, 1 insertions, 34 deletions
diff --git a/chromium/third_party/fips181/BUILD.gn b/chromium/third_party/fips181/BUILD.gn index 6a57d6c0eab..ad952127121 100644 --- a/chromium/third_party/fips181/BUILD.gn +++ b/chromium/third_party/fips181/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -source_set("fips181") { +static_library("fips181") { sources = [ "convert.cc", "convert.h", diff --git a/chromium/third_party/fips181/fips181.gyp b/chromium/third_party/fips181/fips181.gyp deleted file mode 100644 index 23c9c05ef2f..00000000000 --- a/chromium/third_party/fips181/fips181.gyp +++ /dev/null @@ -1,33 +0,0 @@ -# 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. - -{ - 'targets': [ - { - 'target_name': 'fips181', - 'type': 'static_library', - 'include_dirs': [ - '.', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '.', - ], - }, - 'sources': [ - 'convert.cc', - 'convert.h', - 'fips181.cc', - 'fips181.h', - 'owntypes.h', - 'randpass.cc', - 'randpass.h', - 'smbl.h', - ], - 'dependencies': [ - '../../base/base.gyp:base', - ], - }, - ], -} |