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>

1 files changed, 54 insertions, 0 deletions

diff --git a/chromium/components/wifi.gypi b/chromium/components/wifi.gypi
new file mode 100644
index 00000000000..4cfb12abb61
--- /dev/null
+++ b/chromium/components/wifi.gypi
@@ -0,0 +1,54 @@
+# 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'wifi_component',
+      'type': '<(component)',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../components/components.gyp:onc_component',
+        '../third_party/libxml/libxml.gyp:libxml',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'defines': [
+        'WIFI_IMPLEMENTATION',
+      ],
+      'sources': [
+        'wifi/wifi_export.h',
+        'wifi/wifi_service.cc',
+        'wifi/wifi_service.h',
+        'wifi/fake_wifi_service.cc',
+        'wifi/wifi_service_win.cc',
+      ],
+      'conditions': [
+        ['OS == "win"', {
+          'link_settings': {
+            'libraries': [
+              '-liphlpapi.lib',
+            ],
+          },
+        }],
+      ],
+    },
+    {
+      'target_name': 'wifi_test',
+      'type': 'executable',
+      'dependencies': [
+        'wifi_component',
+        '../base/base.gyp:base',
+        '../components/components.gyp:onc_component',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'wifi/wifi_test.cc',
+      ],
+    },
+  ],
+}