Commit 504d2d46 authored by Olivier Robin's avatar Olivier Robin Committed by Commit Bot

Add SSOConfig to the bundles

This adds SSOConfig to the bundle.
The only difference with the current behavior is that the Chrome.app
and EarlGrey application build in out/Official-* will now use the
Chromium clientID.
They previously used the Chrome stable client ID (which is wrong IMO).

Change-Id: I6cd0706c7dc7e50bc238d44a40e6d38cb3ca2ff4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2096643Reviewed-by: default avatarMihai Sardarescu <msarda@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751280}
parent f9699cc0
......@@ -314,10 +314,7 @@ ios_app_bundle("chrome") {
assert(ios_application_icons_target != "",
"ios_application_icons_target must be defined.")
bundle_deps += [ ios_application_icons_target ]
if (ios_firebase_resources_target != "") {
bundle_deps += [ ios_firebase_resources_target ]
}
bundle_deps += ios_providers_resources_targets
} else {
variants = ios_chrome_app_variants
}
......
......@@ -24,13 +24,16 @@ template("ios_eg_test") {
if (!defined(bundle_deps)) {
bundle_deps = []
}
if (!defined(include_provider_resources)) {
include_provider_resources = true
}
bundle_deps += [
"//ios/third_party/earl_grey:earl_grey+bundle",
"//ios/third_party/gtx:gtx+bundle",
"//ios/third_party/ochamcrest:ochamcrest+bundle",
]
if (ios_firebase_resources_target != "") {
bundle_deps += [ ios_firebase_resources_target ]
if (include_provider_resources) {
bundle_deps += ios_providers_resources_targets
}
if (!defined(deps)) {
deps = []
......
......@@ -18,10 +18,12 @@ template("ios_eg2_test_app_host") {
bundle_deps = []
}
bundle_deps += [ "//ios/third_party/earl_grey2:app_framework+bundle" ]
if (ios_firebase_resources_target != "") {
bundle_deps += [ ios_firebase_resources_target ]
if (!defined(include_provider_resources)) {
include_provider_resources = true
}
if (include_provider_resources) {
bundle_deps += ios_providers_resources_targets
}
if (!defined(deps)) {
deps = []
}
......
......@@ -14,6 +14,7 @@ group("all_tests") {
ios_eg_test("ios_web_view_shell_egtests") {
info_plist = "//ios/web_view/shell/Info.plist"
sources = [ "shell_egtest.mm" ]
include_provider_resources = false
deps = [
":earl_grey_test_support",
......
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