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/chrome/browser/safe_browsing | |
| parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
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/chrome/browser/safe_browsing')
3 files changed, 0 insertions, 30 deletions
diff --git a/chromium/chrome/browser/safe_browsing/BUILD.gn b/chromium/chrome/browser/safe_browsing/BUILD.gn index 241e227921c..b59b2e5fbd5 100644 --- a/chromium/chrome/browser/safe_browsing/BUILD.gn +++ b/chromium/chrome/browser/safe_browsing/BUILD.gn @@ -4,7 +4,6 @@ import("//third_party/protobuf/proto_library.gni") -# GYP version: chrome/chrome_browser.gypi:safe_browsing_chunk_proto proto_library("chunk_proto") { sources = [ "chunk.proto", diff --git a/chromium/chrome/browser/safe_browsing/incident_reporting/BUILD.gn b/chromium/chrome/browser/safe_browsing/incident_reporting/BUILD.gn index d8ec0ef8438..4de023f0c17 100644 --- a/chromium/chrome/browser/safe_browsing/incident_reporting/BUILD.gn +++ b/chromium/chrome/browser/safe_browsing/incident_reporting/BUILD.gn @@ -4,7 +4,6 @@ import("//third_party/protobuf/proto_library.gni") -# GYP version: chrome/chrome_browser.gypi:incident_reporting_state_store_data_proto proto_library("state_store_data_proto") { sources = [ "state_store_data.proto", diff --git a/chromium/chrome/browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp b/chromium/chrome/browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp deleted file mode 100644 index acaf6a75d70..00000000000 --- a/chromium/chrome/browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp +++ /dev/null @@ -1,28 +0,0 @@ -{ - 'variables': { - # Unconditionally disable incremental linking for these modules so that - # their exports do not go through an ILT jmp stub. - 'incremental_chrome_dll': '0', # 0 means no - 'msvs_debug_link_incremental': '1', # 1 means /INCREMENTAL:NO - }, - 'targets': [ - { - # GN version: //chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_1 - 'target_name': 'verifier_test_dll_1', - 'type': 'loadable_module', - 'sources': [ - 'verifier_test_dll.cc', - 'verifier_test_dll_1.def', - ], - }, - { - # GN version: //chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2 - 'target_name': 'verifier_test_dll_2', - 'type': 'loadable_module', - 'sources': [ - 'verifier_test_dll.cc', - 'verifier_test_dll_2.def', - ], - }, - ], -} |