Commit f4c02992 authored by Dirk Pranke's avatar Dirk Pranke Committed by Commit Bot

Roll buildtools f115f47867..2637e7e911

  In order to roll GN 5478ca08..a0a05a85 (r528993:r533513) and pick up
  the following changes:

  e93e6df0 Fix gn bootstrap on systems with an old libstdc++
  9a22cda9 Fix GN thread sanitizer bug.
  f7f761c7 Fix misspellings in GN reference
  7c742b6e Fix 'gn gen --check' hanging indefinitely
  31360b70 GN: Fix a memory leak found by LSAN.
  5d253161 Fix gn CHECK()ing when generating Chromium build files
  ff4e4bf5 Reland "android: Don't parse /proc/self/maps to prefetch the library."
  733c2818 Revert "android: Don't parse /proc/self/maps to prefetch the library."
  4c48a351 Support pool for action_foreach
  0b186aa6 Fix gn bootstrap
  ef6f0fb3 android: Don't parse /proc/self/maps to prefetch the library.
  2f14ea14 Add support for include_dirs to gn check.
  cb4f92cc Remove usage of SequencedWorkerPool in GN.
  4c762522 Fix gn bootstrap
  2b31dbb2 android: fix the "end of text" sentinel with lld.

The most notable change here is 2f14ea14, which changes `gn check` to check
includes that are relative to something other than the source root; it
checks against every dir in include_dirs instead. Previously if a file wasn't
located relative to the src root it was just ignored. Now we're able to catch
more errors as a result.

TBR=brettw@chromium.org, slan@chromium.org, kapishnikov@chromium.org, eugenebut@chromium.org



Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ib8164ae81da6b14dacc8db74d2765d62d4dc3761
Reviewed-on: https://chromium-review.googlesource.com/896949Reviewed-by: default avatarAndrei Kapishnikov <kapishnikov@chromium.org>
Reviewed-by: default avatarStephen Lanham <slan@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534469}
parent bb3d0d58
......@@ -95,7 +95,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling build tools
# and whatever else without interference from each other.
'buildtools_revision': 'f115f4786771afdfacb18a2299541b23e21f4792',
'buildtools_revision': '2637e7e911524502ea862870f52c36ed2723a25f',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling SwiftShader
# and whatever else without interference from each other.
......
......@@ -1274,7 +1274,9 @@ template("ios_framework_bundle") {
deps = []
}
deps += [ ":$_arch_shared_library_source" ]
if (_has_public_headers) {
deps += [ ":$_framework_headers_target($default_toolchain)" ]
}
if (!defined(ldflags)) {
ldflags = []
}
......@@ -1399,9 +1401,11 @@ template("ios_framework_bundle") {
forward_variables_from(invoker, [ "testonly" ])
deps = [
":$_compile_headers_map_target",
":$_copy_public_headers_target",
":$_create_module_map_target",
]
public_deps = [
":$_copy_public_headers_target",
]
}
}
......@@ -1633,7 +1637,9 @@ template("ios_xctest_bundle") {
if (ios_automatically_manage_certs) {
# Use a fixed bundle identifier for EarlGrey tests when using Xcode to
# manage the certificates as the number of free certs is limited.
extra_substitutions = [ "MODULE_BUNDLE_ID=gtest.${ios_generic_test_bundle_id_suffix}-module" ]
extra_substitutions = [
"MODULE_BUNDLE_ID=gtest.${ios_generic_test_bundle_id_suffix}-module",
]
} else {
extra_substitutions = [ "MODULE_BUNDLE_ID=gtest.$_output_name" ]
}
......
......@@ -18,6 +18,9 @@ cast_source_set("media") {
]
public_configs = [ ":public_headers" ]
public_deps = [
"//chromecast/public",
]
}
# Any target which includes headers in ":media" should include it in its deps
......
......@@ -12,9 +12,29 @@ config("cronet_native_include_config") {
]
}
source_set("cronet_native_headers") {
deps = [
"//base",
]
configs += [ ":cronet_native_include_config" ]
public_configs = [ ":cronet_native_include_config" ]
public = [
"include/cronet_c.h",
"include/cronet_export.h",
# Generated from cronet.idl.
"generated/cronet.idl_c.h",
"generated/cronet.idl_impl_interface.h",
"generated/cronet.idl_impl_struct.h",
]
}
# Cronet native API implementation.
source_set("cronet_native_impl") {
deps = [
":cronet_native_headers",
"//base",
"//components/cronet:cronet_common",
"//components/cronet:cronet_version_header",
......@@ -23,21 +43,20 @@ source_set("cronet_native_impl") {
configs += [ ":cronet_native_include_config" ]
public_configs = [ ":cronet_native_include_config" ]
public_deps = [
":cronet_native_headers",
]
sources = [
"buffer.cc",
"engine.cc",
"engine.h",
"include/cronet_c.h",
"runnables.cc",
"runnables.h",
# Generated from cronet.idl.
"generated/cronet.idl_c.h",
"generated/cronet.idl_impl_interface.cc",
"generated/cronet.idl_impl_interface.h",
"generated/cronet.idl_impl_struct.cc",
"generated/cronet.idl_impl_struct.h",
]
}
......@@ -46,6 +65,7 @@ source_set("cronet_native_testutil") {
testonly = true
deps = [
":cronet_native_headers",
"//base",
]
......@@ -86,6 +106,7 @@ source_set("cronet_native_tests") {
testonly = true
deps = [
":cronet_native_headers",
":cronet_native_testutil",
"//base",
"//base/test:test_support",
......
......@@ -48,6 +48,7 @@ source_set("test_support") {
sources = [
# Explicitly reference imported headers from web_view library to avoid
# depending on the framework (as it is statically linked).
"//ios/web_view/public/cwv_export.h",
"//ios/web_view/public/cwv_web_view.h",
"//ios/web_view/public/cwv_web_view_configuration.h",
"observer.h",
......
......@@ -39,7 +39,7 @@ static_library("gtest") {
# Android. https://codereview.chromium.org/2852613002/#ps20001
"empty.cc",
]
deps = [
public_deps = [
"//third_party/googletest:gtest",
]
......@@ -75,7 +75,9 @@ static_library("gtest") {
"../coverage_util_ios.h",
"../coverage_util_ios.mm",
]
deps += [ ":ios_enable_coverage" ]
deps = [
":ios_enable_coverage",
]
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment