summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gn58
-rw-r--r--build/config/android/rules.gni4
-rw-r--r--build/config/linux/BUILD.gn20
-rw-r--r--dbus/BUILD.gn4
-rw-r--r--device/bluetooth/BUILD.gn2
-rw-r--r--device/core/BUILD.gn2
-rw-r--r--device/hid/BUILD.gn3
-rw-r--r--device/media_transfer_protocol/BUILD.gn10
-rw-r--r--device/serial/BUILD.gn8
-rw-r--r--device/usb/BUILD.gn3
-rw-r--r--device/vibration/BUILD.gn1
-rw-r--r--device/vibration/android/BUILD.gn2
-rw-r--r--net/BUILD.gn9
-rw-r--r--net/net.gyp1
-rw-r--r--net/net.gypi2
-rw-r--r--net/websockets/websocket_stream.cc3
-rw-r--r--net/websockets/websocket_stream.h19
-rw-r--r--net/websockets/websocket_test_util.h15
-rw-r--r--skia/BUILD.gn4
-rw-r--r--skia/ext/analysis_canvas.cc1
-rw-r--r--sync/BUILD.gn12
-rw-r--r--tools/android/common/BUILD.gn4
-rw-r--r--tools/json_schema_compiler/test/BUILD.gn1
23 files changed, 144 insertions, 44 deletions
diff --git a/.gn b/.gn
index 1429a87..a8b55e2 100644
--- a/.gn
+++ b/.gn
@@ -15,10 +15,60 @@ secondary_source = "//build/secondary/"
# their includes checked for proper dependencies when you run either
# "gn check" or "gn gen --check".
check_targets = [
- # Requires GN binary >= 314794 and to mark the "...__generate_enum" action in
- # build/config/android/rules.gni "java_cpp_enum" template with
- # check_includes = false.
- #"//base/*",
+ #"//apps/*", # Medium-hard.
+ #"//ash/*", # Medium-hard.
+ #"//base/*", # Needs GN binary changes to work on Android.
+ "//blink/*",
+ "//breakpad/*",
+ "//build/*",
"//cc/*",
+
+ #"//chrome/*", # Epic number of errors.
+ "//chromecast/*",
+ "//chrome_elf/*",
+ "//cloud_print/*",
+
+ #"//components/*", # Lots of errors.
+ #"//content/*", # A whole lot of errors.
+ "//courgette/*",
+ "//crypto/*",
+ "//data/*",
+ "//dbus/*",
+ "//device/*",
+
+ #"//extensions/*", # Lots of errors.
+ #"//gin/*", # Easy.
+ #"//google_apis/*", # Easy.
+ "//google_update/*",
+
+ #"//gpu/*", # Lots of errors.
+ #"//ios/*",
"//ipc/*",
+
+ #"//jingle/*",
+ #"//media/*", # Lots of errors.
+ #"//mojo/*",
+ #"//native_client/*",
+ #"//net/*", # Needs GN binary changes to work on Android.
+
+ #"//pdf/*", # Medium-hard.
+ #"//ppapi/*", # Lots of errors.
+ "//printing/*",
+
+ #"//remoting/*", # Medium-hard.
+ #"//rlz/*", # Needs checking on Windows.
+ #"//sandbox/*", # Medium-hard.
+ "//sdch/*",
+ "//skia/*",
+ "//sql/*",
+ "//storage/*",
+ "//sync/*",
+ "//testing/*",
+
+ #"//third_party/*", # May not ever want this.
+ "//tools/*",
+
+ #"//ui/*", # Just a few problems.
+ "//url/*",
+ "//v8/*",
]
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 33dfa37..8582d47 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -346,9 +346,7 @@ template("java_cpp_enum") {
action("${target_name}__generate_enum") {
# The sources aren't compiled so don't check their dependencies.
- # TODO(brettw) uncomment after GN binary rolled pas 314974 (which added
- # support for this value on actions).
- #check_includes = false
+ check_includes = false
sources = invoker.sources
script = "//build/android/gyp/java_cpp_enum.py"
diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn
index 0453c84..202fd73 100644
--- a/build/config/linux/BUILD.gn
+++ b/build/config/linux/BUILD.gn
@@ -180,15 +180,17 @@ pkg_config("gio_config") {
#ignore_libs = true # Loader generated below.
}
-# This generates a target named "gio".
-generate_library_loader("gio") {
- name = "LibGioLoader"
- output_h = "libgio.h"
- output_cc = "libgio_loader.cc"
- header = "<gio/gio.h>"
- config = ":gio_config"
-
- functions = gypi_values.libgio_functions
+if (is_desktop_linux) {
+ # This generates a target named "gio".
+ generate_library_loader("gio") {
+ name = "LibGioLoader"
+ output_h = "libgio.h"
+ output_cc = "libgio_loader.cc"
+ header = "<gio/gio.h>"
+ config = ":gio_config"
+
+ functions = gypi_values.libgio_functions
+ }
}
# This generates a target named "libpci".
diff --git a/dbus/BUILD.gn b/dbus/BUILD.gn
index 4abcdb8..a133e72 100644
--- a/dbus/BUILD.gn
+++ b/dbus/BUILD.gn
@@ -39,9 +39,11 @@ component("dbus") {
defines = [ "DBUS_IMPLEMENTATION" ]
deps = [
- "//base",
"//third_party/protobuf:protobuf_lite",
]
+ public_deps = [
+ "//base",
+ ]
public_configs = [ "//build/config/linux:dbus" ]
}
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index 0e70391..f66af9a 100644
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -214,6 +214,8 @@ static_library("mocks") {
deps = [
":bluetooth",
+ "//base",
+ "//net",
"//testing/gmock",
]
}
diff --git a/device/core/BUILD.gn b/device/core/BUILD.gn
index eefca3b..b77bda8 100644
--- a/device/core/BUILD.gn
+++ b/device/core/BUILD.gn
@@ -9,4 +9,6 @@ source_set("core") {
"device_monitor_win.cc",
"device_monitor_win.h",
]
+
+ deps = [ "//base" ]
}
diff --git a/device/hid/BUILD.gn b/device/hid/BUILD.gn
index 6dc7b17..64e99c4 100644
--- a/device/hid/BUILD.gn
+++ b/device/hid/BUILD.gn
@@ -49,4 +49,7 @@ source_set("hid") {
if (is_linux) {
deps += [ "//device/udev_linux" ]
}
+ if (is_chromeos) {
+ deps += [ "//chromeos" ]
+ }
}
diff --git a/device/media_transfer_protocol/BUILD.gn b/device/media_transfer_protocol/BUILD.gn
index cd37089..a36c606 100644
--- a/device/media_transfer_protocol/BUILD.gn
+++ b/device/media_transfer_protocol/BUILD.gn
@@ -29,10 +29,16 @@ static_library("media_transfer_protocol") {
"media_transfer_protocol_manager.h",
]
- configs += [ "//build/config/linux:dbus" ]
-
public_deps = [
":mtp_file_entry_proto",
":mtp_storage_info_proto",
+ "//base",
+ ]
+ deps = [
+ "//dbus",
]
+
+ if (is_chromeos) {
+ deps += [ "//chromeos" ]
+ }
}
diff --git a/device/serial/BUILD.gn b/device/serial/BUILD.gn
index 1382604..099b7ad 100644
--- a/device/serial/BUILD.gn
+++ b/device/serial/BUILD.gn
@@ -43,12 +43,18 @@ static_library("serial") {
public_deps = [
":serial_mojo",
+ "//base",
+ ]
+ deps = [
+ "//third_party/mojo/src/mojo/public/cpp/system",
]
- deps = []
if (is_linux) {
deps += [ "//device/udev_linux" ]
}
+ if (is_chromeos) {
+ deps += [ "//chromeos" ]
+ }
}
# GYP version: device/serial/serial.gyp:device_serial_test_util
diff --git a/device/usb/BUILD.gn b/device/usb/BUILD.gn
index d4be7cf..cc3646e 100644
--- a/device/usb/BUILD.gn
+++ b/device/usb/BUILD.gn
@@ -43,6 +43,9 @@ source_set("usb") {
if (is_linux) {
deps += [ "//device/udev_linux" ]
}
+ if (is_chromeos) {
+ deps += [ "//chromeos" ]
+ }
}
action("usb_device_ids") {
diff --git a/device/vibration/BUILD.gn b/device/vibration/BUILD.gn
index d2de6ab..fe5a19d 100644
--- a/device/vibration/BUILD.gn
+++ b/device/vibration/BUILD.gn
@@ -33,6 +33,7 @@ component("vibration") {
"//device/vibration/android",
"//device/vibration/android:vibration_jni_headers",
]
+ allow_circular_includes_from = [ "//device/vibration/android" ]
}
}
diff --git a/device/vibration/android/BUILD.gn b/device/vibration/android/BUILD.gn
index 5d9aa22..ec6ab6c 100644
--- a/device/vibration/android/BUILD.gn
+++ b/device/vibration/android/BUILD.gn
@@ -16,6 +16,8 @@ source_set("android") {
defines = [ "DEVICE_VIBRATION_IMPLEMENTATION" ]
deps = [
+ "//base",
+
# vibration_jni_registrar.cc includes a header from device/vibration
# that includes a mojo-generated header file. Make sure the header
# is generated before vibration_jni_registrar.cc is compiled.
diff --git a/net/BUILD.gn b/net/BUILD.gn
index ab6b9e0..76a5cf8 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -84,6 +84,7 @@ component("net") {
public_deps = [
"//crypto",
"//crypto:platform",
+ "//url",
]
deps = [
":net_resources",
@@ -542,6 +543,7 @@ static_library("extras") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
deps = [
":net",
+ "//base",
"//sql:sql",
]
}
@@ -796,6 +798,7 @@ if (use_v8_in_net && !is_android) {
public_deps = [
":mojo_type_converters",
":net",
+ "//base",
"//net/interfaces",
"//third_party/mojo/src/mojo/public/cpp/bindings",
]
@@ -1021,6 +1024,7 @@ if (is_linux) {
"tools/flip_server/spdy_interface_test.cc",
]
deps = [
+ ":balsa",
":flip_in_mem_edsm_server_base",
":net",
":test_support",
@@ -1036,6 +1040,7 @@ if (is_linux) {
"tools/flip_server/flip_in_mem_edsm_server.cc",
]
deps = [
+ ":balsa",
":flip_in_mem_edsm_server_base",
":net",
"//base",
@@ -1092,6 +1097,8 @@ if (is_linux) {
"tools/quic/quic_client_bin.cc",
]
deps = [
+ ":balsa",
+ ":epoll_server",
":quic_base",
":net",
"//base",
@@ -1187,7 +1194,9 @@ if (!is_android && !is_win && !is_mac) {
"//crypto",
"//crypto:platform",
"//crypto:test_support",
+ "//gin",
"//net/base/registry_controlled_domains",
+ "//sql",
"//testing/gmock",
"//testing/gtest",
"//third_party/zlib",
diff --git a/net/net.gyp b/net/net.gyp
index 0fdc518..5c0dbe7 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -262,7 +262,6 @@
'cert/sha256_legacy_support_openssl_win.cc',
'cert/x509_util_openssl.cc',
'cert/x509_util_openssl.h',
- 'crypto/scoped_openssl_types.h',
'quic/crypto/aead_base_decrypter_openssl.cc',
'quic/crypto/aead_base_encrypter_openssl.cc',
'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
diff --git a/net/net.gypi b/net/net.gypi
index 5a8087d..c3c127c 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -170,7 +170,6 @@
'android/android_private_key.h',
'android/cert_verify_result_android.cc',
'android/cert_verify_result_android.h',
- 'android/cert_verify_status_android_list.h',
'android/gurl_utils.cc',
'android/gurl_utils.h',
'android/keystore.cc',
@@ -367,7 +366,6 @@
'cert/nss_profile_filter_chromeos.cc',
'cert/nss_profile_filter_chromeos.h',
'cert/scoped_nss_types.h',
- 'cert/scoped_openssl_types.h',
'cert/sct_status_flags.h',
'cert/test_root_certs.cc',
'cert/test_root_certs.h',
diff --git a/net/websockets/websocket_stream.cc b/net/websockets/websocket_stream.cc
index b0abb3c..32729fb 100644
--- a/net/websockets/websocket_stream.cc
+++ b/net/websockets/websocket_stream.cc
@@ -24,7 +24,6 @@
#include "net/websockets/websocket_handshake_constants.h"
#include "net/websockets/websocket_handshake_stream_base.h"
#include "net/websockets/websocket_handshake_stream_create_helper.h"
-#include "net/websockets/websocket_test_util.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -114,7 +113,7 @@ class StreamRequestImpl : public WebSocketStreamRequest {
void Start(scoped_ptr<base::Timer> timer) {
DCHECK(timer);
- TimeDelta timeout(TimeDelta::FromSeconds(
+ base::TimeDelta timeout(base::TimeDelta::FromSeconds(
kHandshakeTimeoutIntervalInSeconds));
timer_ = timer.Pass();
timer_->Start(FROM_HERE, timeout,
diff --git a/net/websockets/websocket_stream.h b/net/websockets/websocket_stream.h
index 46dc5262..713205a 100644
--- a/net/websockets/websocket_stream.h
+++ b/net/websockets/websocket_stream.h
@@ -22,6 +22,10 @@
class GURL;
+namespace base {
+class Timer;
+}
+
namespace url {
class Origin;
} // namespace url
@@ -31,6 +35,7 @@ namespace net {
class BoundNetLog;
class URLRequestContext;
struct WebSocketFrame;
+class WebSocketHandshakeStreamCreateHelper;
// WebSocketStreamRequest is the caller's handle to the process of creation of a
// WebSocketStream. Deleting the object before the OnSuccess or OnFailure
@@ -210,6 +215,20 @@ void WebSocketDispatchOnFinishOpeningHandshake(
const scoped_refptr<HttpResponseHeaders>& headers,
base::Time response_time);
+// Alternate version of WebSocketStream::CreateAndConnectStream() for testing
+// use only. The differences are the use of a |create_helper| argument in place
+// of |requested_subprotocols| and taking |timer| as the handshake timeout
+// timer. Implemented in websocket_stream.cc.
+NET_EXPORT_PRIVATE scoped_ptr<WebSocketStreamRequest>
+CreateAndConnectStreamForTesting(
+ const GURL& socket_url,
+ scoped_ptr<WebSocketHandshakeStreamCreateHelper> create_helper,
+ const url::Origin& origin,
+ URLRequestContext* url_request_context,
+ const BoundNetLog& net_log,
+ scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate,
+ scoped_ptr<base::Timer> timer);
+
} // namespace net
#endif // NET_WEBSOCKETS_WEBSOCKET_STREAM_H_
diff --git a/net/websockets/websocket_test_util.h b/net/websockets/websocket_test_util.h
index 0230f5c9..a433ca9 100644
--- a/net/websockets/websocket_test_util.h
+++ b/net/websockets/websocket_test_util.h
@@ -29,7 +29,6 @@ class DeterministicMockClientSocketFactory;
class DeterministicSocketData;
class ProxyService;
class URLRequestContext;
-class WebSocketHandshakeStreamCreateHelper;
struct SSLSocketDataProvider;
class LinearCongruentialGenerator {
@@ -41,20 +40,6 @@ class LinearCongruentialGenerator {
uint64 current_;
};
-// Alternate version of WebSocketStream::CreateAndConnectStream() for testing
-// use only. The differences are the use of a |create_helper| argument in place
-// of |requested_subprotocols| and taking |timer| as the handshake timeout
-// timer. Implemented in websocket_stream.cc.
-NET_EXPORT_PRIVATE scoped_ptr<WebSocketStreamRequest>
-CreateAndConnectStreamForTesting(
- const GURL& socket_url,
- scoped_ptr<WebSocketHandshakeStreamCreateHelper> create_helper,
- const url::Origin& origin,
- URLRequestContext* url_request_context,
- const BoundNetLog& net_log,
- scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate,
- scoped_ptr<base::Timer> timer);
-
// Generates a standard WebSocket handshake request. The challenge key used is
// "dGhlIHNhbXBsZSBub25jZQ==". Each header in |extra_headers| must be terminated
// with "\r\n".
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 90a25f5..69940ae 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -311,6 +311,9 @@ component("skia") {
sources += gypi_skia_utils.sources
sources += gypi_values.skia_library_sources
+ # This and skia_opts are really the same conceptual target so share headers.
+ allow_circular_includes_from = [ ":skia_opts" ]
+
if (current_cpu == "arm") {
sources += [
"//third_party/skia/src/core/SkUtilsArm.cpp",
@@ -624,6 +627,7 @@ test("skia_unittests") {
":skia",
"//base",
"//base/test:run_all_unittests",
+ "//cc:test_support", # TODO: Fix this test to not depend on cc.
"//testing/gtest",
"//ui/gfx",
"//ui/gfx/geometry",
diff --git a/skia/ext/analysis_canvas.cc b/skia/ext/analysis_canvas.cc
index 376d173..fe447c7 100644
--- a/skia/ext/analysis_canvas.cc
+++ b/skia/ext/analysis_canvas.cc
@@ -9,7 +9,6 @@
#include "third_party/skia/include/core/SkRRect.h"
#include "third_party/skia/include/core/SkShader.h"
#include "third_party/skia/src/core/SkRasterClip.h"
-#include "ui/gfx/geometry/rect_conversions.h"
namespace {
diff --git a/sync/BUILD.gn b/sync/BUILD.gn
index e3d8f0d..4e830bc 100644
--- a/sync/BUILD.gn
+++ b/sync/BUILD.gn
@@ -540,8 +540,9 @@ static_library("test_support_sync_api") {
defines = [ "SYNC_TEST" ]
public_deps = [
- "//testing/gmock",
+ "//base",
"//sync",
+ "//testing/gmock",
]
}
@@ -629,6 +630,8 @@ test("sync_unit_tests") {
]
deps = [
+ ":test_support_sync_core",
+ ":test_support_sync_internal_api",
"//base",
"//base/allocator",
"//base/test:run_all_unittests",
@@ -638,12 +641,11 @@ test("sync_unit_tests") {
"//net:test_support",
"//sql",
"//sync",
+ "//sync/internal_api/attachments/proto",
"//testing/gmock",
"//testing/gtest",
"//third_party/leveldatabase",
"//third_party/protobuf:protobuf_lite",
- ":test_support_sync_core",
- ":test_support_sync_internal_api",
]
if (is_chromeos) {
@@ -694,6 +696,7 @@ static_library("test_support_sync_fake_server") {
"//testing/gtest",
"//third_party/protobuf:protobuf_lite",
"//sync",
+ "//url",
]
forward_dependent_configs_from = [ "//third_party/protobuf:protobuf_lite" ]
@@ -734,6 +737,7 @@ static_library("test_support_accounts_client") {
deps = [
"//base",
"//net",
+ "//url",
]
}
@@ -743,6 +747,7 @@ test("sync_endtoend_tests") {
"test/accounts_client/test_accounts_client_unittest.cc",
]
deps = [
+ "//base",
"//base/test:run_all_unittests",
"//testing/gmock",
"//testing/gtest",
@@ -802,6 +807,7 @@ if (is_android) {
]
deps = [
":fake_server_jni",
+ ":sync_core",
":test_support_sync_fake_server",
"//base",
"//testing/gtest",
diff --git a/tools/android/common/BUILD.gn b/tools/android/common/BUILD.gn
index 8307a91..3c86741 100644
--- a/tools/android/common/BUILD.gn
+++ b/tools/android/common/BUILD.gn
@@ -12,4 +12,8 @@ source_set("common") {
"net.cc",
"net.h",
]
+
+ deps = [
+ "//base",
+ ]
}
diff --git a/tools/json_schema_compiler/test/BUILD.gn b/tools/json_schema_compiler/test/BUILD.gn
index f91e699..9b0c1b9 100644
--- a/tools/json_schema_compiler/test/BUILD.gn
+++ b/tools/json_schema_compiler/test/BUILD.gn
@@ -42,5 +42,6 @@ source_set("test") {
public_deps = [
":api",
+ "//base",
]
}
generated by cgit v1.1 at 2024-05-12 07:50:44 +0000