summaryrefslogtreecommitdiff
path: root/chromium/build/config/ios/rules.gni
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-03 13:42:47 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-15 10:27:51 +0000
commit8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch)
treed29d987c4d7b173cf853279b79a51598f104b403 /chromium/build/config/ios/rules.gni
parent830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff)
downloadqtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/build/config/ios/rules.gni')
-rw-r--r--chromium/build/config/ios/rules.gni12
1 files changed, 9 insertions, 3 deletions
diff --git a/chromium/build/config/ios/rules.gni b/chromium/build/config/ios/rules.gni
index 95f72f72f53..f820ef36e26 100644
--- a/chromium/build/config/ios/rules.gni
+++ b/chromium/build/config/ios/rules.gni
@@ -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" ]
}