Cronet iOS: Remove remaining references
- This removes webview feature flag for bundling with cronet ios
- Removes exclusion of iOS cronet from cronet's tryserver
Bug: 1497426
, 1501395
Change-Id: I0c8d676138c3ca0bb9b877395760334256f93125
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5029858
Reviewed-by: Gary Tong <gatong@chromium.org>
Commit-Queue: Chidera Olibie <colibie@google.com>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1226169}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
3f45577763
commit
c7f870ccb1
2
BUILD.gn
2
BUILD.gn
@ -83,8 +83,6 @@ group("gn_all") {
|
|||||||
if (is_cronet_build) {
|
if (is_cronet_build) {
|
||||||
if (is_android) {
|
if (is_android) {
|
||||||
deps = [ "//components/cronet/android:cronet_package_android" ]
|
deps = [ "//components/cronet/android:cronet_package_android" ]
|
||||||
} else if (is_ios) {
|
|
||||||
deps = [ "//components/cronet/ios:cronet_package_ios" ]
|
|
||||||
} else {
|
} else {
|
||||||
deps = []
|
deps = []
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,5 @@ created binary streams. In Chromium, this binary blob is a
|
|||||||
net::URLRequestContextGetter, which is used by grpc_support::BidirectionalStream
|
net::URLRequestContextGetter, which is used by grpc_support::BidirectionalStream
|
||||||
to drive a net::BidirectionalStream.
|
to drive a net::BidirectionalStream.
|
||||||
|
|
||||||
Currently Cronet (//components/cronet/ios) is the only consumer of this API,
|
Eventually code inside of Chromium should be able to use gRPC by providing
|
||||||
but eventually code inside of Chromium should be able to use gRPC by providing
|
|
||||||
a net::URLRequestContextGetter.
|
a net::URLRequestContextGetter.
|
||||||
|
@ -109,7 +109,6 @@ builder.
|
|||||||
* [`//components/grpc_support/.+`](https://cs.chromium.org/chromium/src/components/grpc_support/)
|
* [`//components/grpc_support/.+`](https://cs.chromium.org/chromium/src/components/grpc_support/)
|
||||||
* [`//build/android/.+`](https://cs.chromium.org/chromium/src/build/android/)
|
* [`//build/android/.+`](https://cs.chromium.org/chromium/src/build/android/)
|
||||||
* [`//build/config/android/.+`](https://cs.chromium.org/chromium/src/build/config/android/)
|
* [`//build/config/android/.+`](https://cs.chromium.org/chromium/src/build/config/android/)
|
||||||
* exclude: [`//components/cronet/ios/.+`](https://cs.chromium.org/chromium/src/components/cronet/ios/)
|
|
||||||
|
|
||||||
* [android-cronet-x64-dbg-13-tests](https://ci.chromium.org/p/chromium/builders/try/android-cronet-x64-dbg-13-tests) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""android-cronet-x64-dbg-13-tests""))
|
* [android-cronet-x64-dbg-13-tests](https://ci.chromium.org/p/chromium/builders/try/android-cronet-x64-dbg-13-tests) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""android-cronet-x64-dbg-13-tests""))
|
||||||
|
|
||||||
@ -118,7 +117,6 @@ builder.
|
|||||||
* [`//components/grpc_support/.+`](https://cs.chromium.org/chromium/src/components/grpc_support/)
|
* [`//components/grpc_support/.+`](https://cs.chromium.org/chromium/src/components/grpc_support/)
|
||||||
* [`//build/android/.+`](https://cs.chromium.org/chromium/src/build/android/)
|
* [`//build/android/.+`](https://cs.chromium.org/chromium/src/build/android/)
|
||||||
* [`//build/config/android/.+`](https://cs.chromium.org/chromium/src/build/config/android/)
|
* [`//build/config/android/.+`](https://cs.chromium.org/chromium/src/build/config/android/)
|
||||||
* exclude: [`//components/cronet/ios/.+`](https://cs.chromium.org/chromium/src/components/cronet/ios/)
|
|
||||||
|
|
||||||
* [android-cronet-x86-dbg-lollipop-tests](https://ci.chromium.org/p/chromium/builders/try/android-cronet-x86-dbg-lollipop-tests) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""android-cronet-x86-dbg-lollipop-tests""))
|
* [android-cronet-x86-dbg-lollipop-tests](https://ci.chromium.org/p/chromium/builders/try/android-cronet-x86-dbg-lollipop-tests) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""android-cronet-x86-dbg-lollipop-tests""))
|
||||||
|
|
||||||
@ -127,7 +125,6 @@ builder.
|
|||||||
* [`//components/grpc_support/.+`](https://cs.chromium.org/chromium/src/components/grpc_support/)
|
* [`//components/grpc_support/.+`](https://cs.chromium.org/chromium/src/components/grpc_support/)
|
||||||
* [`//build/android/.+`](https://cs.chromium.org/chromium/src/build/android/)
|
* [`//build/android/.+`](https://cs.chromium.org/chromium/src/build/android/)
|
||||||
* [`//build/config/android/.+`](https://cs.chromium.org/chromium/src/build/config/android/)
|
* [`//build/config/android/.+`](https://cs.chromium.org/chromium/src/build/config/android/)
|
||||||
* exclude: [`//components/cronet/ios/.+`](https://cs.chromium.org/chromium/src/components/cronet/ios/)
|
|
||||||
|
|
||||||
* [android-pie-arm64-dbg](https://ci.chromium.org/p/chromium/builders/try/android-pie-arm64-dbg) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""android-pie-arm64-dbg""))
|
* [android-pie-arm64-dbg](https://ci.chromium.org/p/chromium/builders/try/android-pie-arm64-dbg) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""android-pie-arm64-dbg""))
|
||||||
|
|
||||||
|
@ -160,12 +160,6 @@ config_groups {
|
|||||||
gerrit_project_regexp: ".*"
|
gerrit_project_regexp: ".*"
|
||||||
path_regexp: "build/config/android/.+"
|
path_regexp: "build/config/android/.+"
|
||||||
}
|
}
|
||||||
location_filters {
|
|
||||||
gerrit_host_regexp: ".*"
|
|
||||||
gerrit_project_regexp: ".*"
|
|
||||||
path_regexp: "components/cronet/ios/.+"
|
|
||||||
exclude: true
|
|
||||||
}
|
|
||||||
location_filters {
|
location_filters {
|
||||||
gerrit_host_regexp: ".*"
|
gerrit_host_regexp: ".*"
|
||||||
gerrit_project_regexp: ".*"
|
gerrit_project_regexp: ".*"
|
||||||
@ -206,12 +200,6 @@ config_groups {
|
|||||||
gerrit_project_regexp: ".*"
|
gerrit_project_regexp: ".*"
|
||||||
path_regexp: "build/config/android/.+"
|
path_regexp: "build/config/android/.+"
|
||||||
}
|
}
|
||||||
location_filters {
|
|
||||||
gerrit_host_regexp: ".*"
|
|
||||||
gerrit_project_regexp: ".*"
|
|
||||||
path_regexp: "components/cronet/ios/.+"
|
|
||||||
exclude: true
|
|
||||||
}
|
|
||||||
location_filters {
|
location_filters {
|
||||||
gerrit_host_regexp: ".*"
|
gerrit_host_regexp: ".*"
|
||||||
gerrit_project_regexp: ".*"
|
gerrit_project_regexp: ".*"
|
||||||
@ -252,12 +240,6 @@ config_groups {
|
|||||||
gerrit_project_regexp: ".*"
|
gerrit_project_regexp: ".*"
|
||||||
path_regexp: "build/config/android/.+"
|
path_regexp: "build/config/android/.+"
|
||||||
}
|
}
|
||||||
location_filters {
|
|
||||||
gerrit_host_regexp: ".*"
|
|
||||||
gerrit_project_regexp: ".*"
|
|
||||||
path_regexp: "components/cronet/ios/.+"
|
|
||||||
exclude: true
|
|
||||||
}
|
|
||||||
location_filters {
|
location_filters {
|
||||||
gerrit_host_regexp: ".*"
|
gerrit_host_regexp: ".*"
|
||||||
gerrit_project_regexp: ".*"
|
gerrit_project_regexp: ".*"
|
||||||
|
@ -631,12 +631,6 @@ config_groups {
|
|||||||
gerrit_project_regexp: ".*"
|
gerrit_project_regexp: ".*"
|
||||||
path_regexp: "build/config/android/.+"
|
path_regexp: "build/config/android/.+"
|
||||||
}
|
}
|
||||||
location_filters {
|
|
||||||
gerrit_host_regexp: ".*"
|
|
||||||
gerrit_project_regexp: ".*"
|
|
||||||
path_regexp: "components/cronet/ios/.+"
|
|
||||||
exclude: true
|
|
||||||
}
|
|
||||||
location_filters {
|
location_filters {
|
||||||
gerrit_host_regexp: ".*"
|
gerrit_host_regexp: ".*"
|
||||||
gerrit_project_regexp: ".*"
|
gerrit_project_regexp: ".*"
|
||||||
@ -723,12 +717,6 @@ config_groups {
|
|||||||
gerrit_project_regexp: ".*"
|
gerrit_project_regexp: ".*"
|
||||||
path_regexp: "build/config/android/.+"
|
path_regexp: "build/config/android/.+"
|
||||||
}
|
}
|
||||||
location_filters {
|
|
||||||
gerrit_host_regexp: ".*"
|
|
||||||
gerrit_project_regexp: ".*"
|
|
||||||
path_regexp: "components/cronet/ios/.+"
|
|
||||||
exclude: true
|
|
||||||
}
|
|
||||||
location_filters {
|
location_filters {
|
||||||
gerrit_host_regexp: ".*"
|
gerrit_host_regexp: ".*"
|
||||||
gerrit_project_regexp: ".*"
|
gerrit_project_regexp: ".*"
|
||||||
@ -791,12 +779,6 @@ config_groups {
|
|||||||
gerrit_project_regexp: ".*"
|
gerrit_project_regexp: ".*"
|
||||||
path_regexp: "build/config/android/.+"
|
path_regexp: "build/config/android/.+"
|
||||||
}
|
}
|
||||||
location_filters {
|
|
||||||
gerrit_host_regexp: ".*"
|
|
||||||
gerrit_project_regexp: ".*"
|
|
||||||
path_regexp: "components/cronet/ios/.+"
|
|
||||||
exclude: true
|
|
||||||
}
|
|
||||||
location_filters {
|
location_filters {
|
||||||
gerrit_host_regexp: ".*"
|
gerrit_host_regexp: ".*"
|
||||||
gerrit_project_regexp: ".*"
|
gerrit_project_regexp: ".*"
|
||||||
|
@ -349,7 +349,6 @@ try_.builder(
|
|||||||
"components/grpc_support/.+",
|
"components/grpc_support/.+",
|
||||||
"build/android/.+",
|
"build/android/.+",
|
||||||
"build/config/android/.+",
|
"build/config/android/.+",
|
||||||
cq.location_filter(exclude = True, path_regexp = "components/cronet/ios/.+"),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@ -474,7 +473,6 @@ try_.builder(
|
|||||||
"components/grpc_support/.+",
|
"components/grpc_support/.+",
|
||||||
"build/android/.+",
|
"build/android/.+",
|
||||||
"build/config/android/.+",
|
"build/config/android/.+",
|
||||||
cq.location_filter(exclude = True, path_regexp = "components/cronet/ios/.+"),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@ -584,7 +582,6 @@ try_.builder(
|
|||||||
"components/grpc_support/.+",
|
"components/grpc_support/.+",
|
||||||
"build/android/.+",
|
"build/android/.+",
|
||||||
"build/config/android/.+",
|
"build/config/android/.+",
|
||||||
cq.location_filter(exclude = True, path_regexp = "components/cronet/ios/.+"),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
@ -15,9 +15,7 @@ import("//ios/features.gni")
|
|||||||
# are not used upstream to ensure they are not broken inadvertently.
|
# are not used upstream to ensure they are not broken inadvertently.
|
||||||
group("all") {
|
group("all") {
|
||||||
testonly = true
|
testonly = true
|
||||||
if (is_cronet_build) {
|
if (is_webkit_only_build) {
|
||||||
deps = [ "//components/cronet/ios:cronet_package_ios" ]
|
|
||||||
} else if (is_webkit_only_build) {
|
|
||||||
deps = [ "//ios/third_party/webkit" ]
|
deps = [ "//ios/third_party/webkit" ]
|
||||||
} else if (ios_build_chrome) {
|
} else if (ios_build_chrome) {
|
||||||
deps = [
|
deps = [
|
||||||
|
@ -6,15 +6,15 @@ import("//build/apple/tweak_info_plist.gni")
|
|||||||
import("//build/config/ios/ios_sdk.gni")
|
import("//build/config/ios/ios_sdk.gni")
|
||||||
import("//build/config/ios/rules.gni")
|
import("//build/config/ios/rules.gni")
|
||||||
import("//build/config/locales.gni")
|
import("//build/config/locales.gni")
|
||||||
import("//components/cronet/native/include/headers.gni")
|
|
||||||
import("//components/grpc_support/include/headers.gni")
|
import("//components/grpc_support/include/headers.gni")
|
||||||
import("//ios/build/config.gni")
|
import("//ios/build/config.gni")
|
||||||
import("//ios/web/public/js_messaging/optimize_js.gni")
|
import("//ios/web/public/js_messaging/optimize_js.gni")
|
||||||
import("//ios/web_view/features.gni")
|
|
||||||
import("//ios/web_view/repack.gni")
|
import("//ios/web_view/repack.gni")
|
||||||
import("//testing/test.gni")
|
import("//testing/test.gni")
|
||||||
import("//tools/grit/repack.gni")
|
import("//tools/grit/repack.gni")
|
||||||
|
|
||||||
|
_ios_web_view_output_name = "ChromeWebView"
|
||||||
|
|
||||||
group("all_tests") {
|
group("all_tests") {
|
||||||
testonly = true
|
testonly = true
|
||||||
deps = [
|
deps = [
|
||||||
@ -425,7 +425,7 @@ source_set("web_view_sources") {
|
|||||||
action("web_view_umbrella_header") {
|
action("web_view_umbrella_header") {
|
||||||
script = "//build/config/ios/generate_umbrella_header.py"
|
script = "//build/config/ios/generate_umbrella_header.py"
|
||||||
|
|
||||||
full_header_path = target_gen_dir + "/" + ios_web_view_output_name + ".h"
|
full_header_path = target_gen_dir + "/" + _ios_web_view_output_name + ".h"
|
||||||
outputs = [ full_header_path ]
|
outputs = [ full_header_path ]
|
||||||
|
|
||||||
args = [
|
args = [
|
||||||
@ -441,24 +441,16 @@ tweak_info_plist("info_plist") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ios_framework_bundle("web_view") {
|
ios_framework_bundle("web_view") {
|
||||||
output_name = ios_web_view_output_name
|
output_name = _ios_web_view_output_name
|
||||||
info_plist_target = ":info_plist"
|
info_plist_target = ":info_plist"
|
||||||
|
|
||||||
ldflags = [ "-fapplication-extension" ]
|
ldflags = [ "-fapplication-extension" ]
|
||||||
|
|
||||||
public_headers = get_target_outputs(":web_view_umbrella_header")
|
public_headers = get_target_outputs(":web_view_umbrella_header")
|
||||||
public_headers += ios_web_view_public_headers
|
public_headers += ios_web_view_public_headers
|
||||||
if (ios_web_view_include_cronet) {
|
|
||||||
public_headers += [ "//components/cronet/ios/Cronet.h" ]
|
|
||||||
public_headers += grpc_public_headers
|
|
||||||
public_headers += cronet_native_public_headers
|
|
||||||
}
|
|
||||||
|
|
||||||
sources = ios_web_view_public_headers
|
sources = ios_web_view_public_headers
|
||||||
sources += [ "internal/web_view_global_state_util.mm" ]
|
sources += [ "internal/web_view_global_state_util.mm" ]
|
||||||
if (ios_web_view_include_cronet) {
|
|
||||||
sources += [ "//components/cronet/ios/Cronet.h" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
":web_view_sources",
|
":web_view_sources",
|
||||||
@ -467,15 +459,8 @@ ios_framework_bundle("web_view") {
|
|||||||
"//testing/gtest:ios_coverage_utils",
|
"//testing/gtest:ios_coverage_utils",
|
||||||
]
|
]
|
||||||
deps += [ ":web_view_umbrella_header" ]
|
deps += [ ":web_view_umbrella_header" ]
|
||||||
if (ios_web_view_include_cronet) {
|
|
||||||
deps += [ "//components/cronet/ios:cronet_sources" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
configs += [ ":config" ]
|
configs += [ ":config" ]
|
||||||
if (ios_web_view_include_cronet) {
|
|
||||||
configs -= [ "//build/config/compiler:default_symbols" ]
|
|
||||||
configs += [ "//build/config/compiler:symbols" ]
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
source_set("run_all_unittests") {
|
source_set("run_all_unittests") {
|
||||||
@ -654,7 +639,7 @@ action("ios_web_view_generate_license") {
|
|||||||
|
|
||||||
copy("ios_web_view_package_copy") {
|
copy("ios_web_view_package_copy") {
|
||||||
sources = [
|
sources = [
|
||||||
"$root_out_dir/$ios_web_view_output_name.framework",
|
"$root_out_dir/$_ios_web_view_output_name.framework",
|
||||||
"//AUTHORS",
|
"//AUTHORS",
|
||||||
"//chrome/VERSION",
|
"//chrome/VERSION",
|
||||||
]
|
]
|
||||||
@ -671,11 +656,11 @@ if (enable_dsyms) {
|
|||||||
# the target outputs that correspond to the dSYMs (since a dSYM is a
|
# the target outputs that correspond to the dSYMs (since a dSYM is a
|
||||||
# directory it cannot be listed as a source file). The targets that
|
# directory it cannot be listed as a source file). The targets that
|
||||||
# generate both the dSYM and binary image are listed in deps.
|
# generate both the dSYM and binary image are listed in deps.
|
||||||
_dsyms = [ "$root_out_dir/$ios_web_view_output_name.dSYM" ]
|
_dsyms = [ "$root_out_dir/$_ios_web_view_output_name.dSYM" ]
|
||||||
|
|
||||||
sources = [ "$root_out_dir/$ios_web_view_output_name.framework" ]
|
sources = [ "$root_out_dir/$_ios_web_view_output_name.framework" ]
|
||||||
|
|
||||||
_output = "$_package_dir/$ios_web_view_output_name.dSYM.tar.bz2"
|
_output = "$_package_dir/$_ios_web_view_output_name.dSYM.tar.bz2"
|
||||||
|
|
||||||
outputs = [ _output ]
|
outputs = [ _output ]
|
||||||
|
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
# Copyright 2017 The Chromium Authors
|
|
||||||
# Use of this source code is governed by a BSD-style license that can be
|
|
||||||
# found in the LICENSE file.
|
|
||||||
|
|
||||||
declare_args() {
|
|
||||||
# Controls if cronet is included.
|
|
||||||
ios_web_view_include_cronet = false
|
|
||||||
|
|
||||||
# Controls the output name of the built framework.
|
|
||||||
ios_web_view_output_name = "ChromeWebView"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Overridding ios_web_view_include_cronet is no longer supported,
|
|
||||||
# set the value back to the default.
|
|
||||||
ios_web_view_include_cronet = false
|
|
@ -5,7 +5,6 @@
|
|||||||
import("//build/buildflag_header.gni")
|
import("//build/buildflag_header.gni")
|
||||||
import("//build/config/ios/ios_sdk.gni")
|
import("//build/config/ios/ios_sdk.gni")
|
||||||
import("//build/config/ios/rules.gni")
|
import("//build/config/ios/rules.gni")
|
||||||
import("//ios/web_view/features.gni")
|
|
||||||
|
|
||||||
declare_args() {
|
declare_args() {
|
||||||
# The bundle identifier. Overriding this will affect the provisioning profile
|
# The bundle identifier. Overriding this will affect the provisioning profile
|
||||||
@ -37,11 +36,6 @@ declare_args() {
|
|||||||
ios_web_view_shell_entitlements_path = "//build/config/ios/entitlements.plist"
|
ios_web_view_shell_entitlements_path = "//build/config/ios/entitlements.plist"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildflag_header("buildflags") {
|
|
||||||
header = "buildflags.h"
|
|
||||||
flags = [ "IOS_WEB_VIEW_INCLUDE_CRONET=$ios_web_view_include_cronet" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
ios_app_bundle("ios_web_view_shell") {
|
ios_app_bundle("ios_web_view_shell") {
|
||||||
info_plist = "Info.plist"
|
info_plist = "Info.plist"
|
||||||
|
|
||||||
@ -59,42 +53,33 @@ ios_app_bundle("ios_web_view_shell") {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
source_set("cwv_framework") {
|
|
||||||
sources = [ "cwv_framework.h" ]
|
|
||||||
|
|
||||||
deps = [
|
|
||||||
":buildflags",
|
|
||||||
"//ios/web_view:web_view+link",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
source_set("shell_auth_service_interface") {
|
source_set("shell_auth_service_interface") {
|
||||||
sources = [ "shell_auth_service.h" ]
|
sources = [ "shell_auth_service.h" ]
|
||||||
|
|
||||||
deps = [ ":cwv_framework" ]
|
deps = [ "//ios/web_view:web_view+link" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
source_set("shell_auth_service_fake_impl") {
|
source_set("shell_auth_service_fake_impl") {
|
||||||
sources = [ "shell_auth_service_fake.m" ]
|
sources = [ "shell_auth_service_fake.m" ]
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
":cwv_framework",
|
|
||||||
":shell_auth_service_interface",
|
":shell_auth_service_interface",
|
||||||
|
"//ios/web_view:web_view+link",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
source_set("shell_risk_data_loader_interface") {
|
source_set("shell_risk_data_loader_interface") {
|
||||||
sources = [ "shell_risk_data_loader.h" ]
|
sources = [ "shell_risk_data_loader.h" ]
|
||||||
|
|
||||||
deps = [ ":cwv_framework" ]
|
deps = [ "//ios/web_view:web_view+link" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
source_set("shell_risk_data_loader_fake_impl") {
|
source_set("shell_risk_data_loader_fake_impl") {
|
||||||
sources = [ "shell_risk_data_loader_fake.m" ]
|
sources = [ "shell_risk_data_loader_fake.m" ]
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
":cwv_framework",
|
|
||||||
":shell_risk_data_loader_interface",
|
":shell_risk_data_loader_interface",
|
||||||
|
"//ios/web_view:web_view+link",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -102,8 +87,8 @@ source_set("shell_trusted_vault_provider_interface") {
|
|||||||
sources = [ "shell_trusted_vault_provider.h" ]
|
sources = [ "shell_trusted_vault_provider.h" ]
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
":cwv_framework",
|
|
||||||
":shell_auth_service_interface",
|
":shell_auth_service_interface",
|
||||||
|
"//ios/web_view:web_view+link",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -111,8 +96,8 @@ source_set("shell_trusted_vault_provider_fake_impl") {
|
|||||||
sources = [ "shell_trusted_vault_provider_fake.m" ]
|
sources = [ "shell_trusted_vault_provider_fake.m" ]
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
":cwv_framework",
|
|
||||||
":shell_trusted_vault_provider_interface",
|
":shell_trusted_vault_provider_interface",
|
||||||
|
"//ios/web_view:web_view+link",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -130,12 +115,12 @@ source_set("shell") {
|
|||||||
]
|
]
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
":cwv_framework",
|
|
||||||
":shell_auth_service_interface",
|
":shell_auth_service_interface",
|
||||||
":shell_risk_data_loader_interface",
|
":shell_risk_data_loader_interface",
|
||||||
":shell_trusted_vault_provider_interface",
|
":shell_trusted_vault_provider_interface",
|
||||||
"//base",
|
"//base",
|
||||||
"//ios/third_party/webkit",
|
"//ios/third_party/webkit",
|
||||||
|
"//ios/web_view:web_view+link",
|
||||||
ios_web_view_shell_auth_service,
|
ios_web_view_shell_auth_service,
|
||||||
ios_web_view_shell_risk_data_loader,
|
ios_web_view_shell_risk_data_loader,
|
||||||
ios_web_view_shell_trusted_vault_provider,
|
ios_web_view_shell_trusted_vault_provider,
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
// Copyright 2023 The Chromium Authors
|
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
|
||||||
// found in the LICENSE file.
|
|
||||||
|
|
||||||
#ifndef IOS_WEB_VIEW_SHELL_CWV_FRAMEWORK_H_
|
|
||||||
#define IOS_WEB_VIEW_SHELL_CWV_FRAMEWORK_H_
|
|
||||||
|
|
||||||
#import "ios/web_view/shell/buildflags.h"
|
|
||||||
|
|
||||||
#if BUILDFLAG(IOS_WEB_VIEW_INCLUDE_CRONET)
|
|
||||||
#import <CronetChromeWebView/CronetChromeWebView.h>
|
|
||||||
#else
|
|
||||||
#import <ChromeWebView/ChromeWebView.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // IOS_WEB_VIEW_SHELL_CWV_FRAMEWORK_H_
|
|
@ -4,7 +4,7 @@
|
|||||||
#ifndef IOS_WEB_VIEW_SHELL_SHELL_AUTH_SERVICE_H_
|
#ifndef IOS_WEB_VIEW_SHELL_SHELL_AUTH_SERVICE_H_
|
||||||
#define IOS_WEB_VIEW_SHELL_SHELL_AUTH_SERVICE_H_
|
#define IOS_WEB_VIEW_SHELL_SHELL_AUTH_SERVICE_H_
|
||||||
|
|
||||||
#import "ios/web_view/shell/cwv_framework.h"
|
#import <ChromeWebView/ChromeWebView.h>
|
||||||
|
|
||||||
NS_ASSUME_NONNULL_BEGIN
|
NS_ASSUME_NONNULL_BEGIN
|
||||||
|
|
||||||
|
@ -5,8 +5,9 @@
|
|||||||
#ifndef IOS_WEB_VIEW_SHELL_SHELL_AUTOFILL_DELEGATE_H_
|
#ifndef IOS_WEB_VIEW_SHELL_SHELL_AUTOFILL_DELEGATE_H_
|
||||||
#define IOS_WEB_VIEW_SHELL_SHELL_AUTOFILL_DELEGATE_H_
|
#define IOS_WEB_VIEW_SHELL_SHELL_AUTOFILL_DELEGATE_H_
|
||||||
|
|
||||||
|
#import <ChromeWebView/ChromeWebView.h>
|
||||||
|
|
||||||
#import <Foundation/Foundation.h>
|
#import <Foundation/Foundation.h>
|
||||||
#import "ios/web_view/shell/cwv_framework.h"
|
|
||||||
|
|
||||||
NS_ASSUME_NONNULL_BEGIN
|
NS_ASSUME_NONNULL_BEGIN
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
#ifndef IOS_WEB_VIEW_SHELL_SHELL_TRANSLATION_DELEGATE_H_
|
#ifndef IOS_WEB_VIEW_SHELL_SHELL_TRANSLATION_DELEGATE_H_
|
||||||
#define IOS_WEB_VIEW_SHELL_SHELL_TRANSLATION_DELEGATE_H_
|
#define IOS_WEB_VIEW_SHELL_SHELL_TRANSLATION_DELEGATE_H_
|
||||||
|
|
||||||
#import "ios/web_view/shell/cwv_framework.h"
|
#import <ChromeWebView/ChromeWebView.h>
|
||||||
|
|
||||||
#import <Foundation/Foundation.h>
|
#import <Foundation/Foundation.h>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
#ifndef IOS_WEB_VIEW_SHELL_SHELL_TRUSTED_VAULT_PROVIDER_H_
|
#ifndef IOS_WEB_VIEW_SHELL_SHELL_TRUSTED_VAULT_PROVIDER_H_
|
||||||
#define IOS_WEB_VIEW_SHELL_SHELL_TRUSTED_VAULT_PROVIDER_H_
|
#define IOS_WEB_VIEW_SHELL_SHELL_TRUSTED_VAULT_PROVIDER_H_
|
||||||
|
|
||||||
#import "ios/web_view/shell/cwv_framework.h"
|
#import <ChromeWebView/ChromeWebView.h>
|
||||||
|
|
||||||
#import "ios/web_view/shell/shell_auth_service.h"
|
#import "ios/web_view/shell/shell_auth_service.h"
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
#ifndef IOS_WEB_VIEW_SHELL_SHELL_VIEW_CONTROLLER_H_
|
#ifndef IOS_WEB_VIEW_SHELL_SHELL_VIEW_CONTROLLER_H_
|
||||||
#define IOS_WEB_VIEW_SHELL_SHELL_VIEW_CONTROLLER_H_
|
#define IOS_WEB_VIEW_SHELL_SHELL_VIEW_CONTROLLER_H_
|
||||||
|
|
||||||
#import "ios/web_view/shell/cwv_framework.h"
|
#import <ChromeWebView/ChromeWebView.h>
|
||||||
|
|
||||||
#import <UIKit/UIKit.h>
|
#import <UIKit/UIKit.h>
|
||||||
|
|
||||||
|
@ -4,33 +4,25 @@
|
|||||||
|
|
||||||
import("//build/config/ios/rules.gni")
|
import("//build/config/ios/rules.gni")
|
||||||
import("//ios/build/config.gni")
|
import("//ios/build/config.gni")
|
||||||
import("//ios/web_view/features.gni")
|
|
||||||
import("//testing/test.gni")
|
import("//testing/test.gni")
|
||||||
|
|
||||||
source_set("inttests") {
|
source_set("inttests") {
|
||||||
testonly = true
|
testonly = true
|
||||||
sources = []
|
|
||||||
|
|
||||||
# All those test files use framework import, thus they depend on the name
|
sources = [
|
||||||
# of the framework. If some bot build the framework with a different name,
|
"navigation_delegate_inttest.mm",
|
||||||
# their compilation fail. So only build those files if the framework has
|
"scroll_view_kvo_inttest.mm",
|
||||||
# not be renamed.
|
"ui_delegate_inttest.mm",
|
||||||
if (ios_web_view_output_name == "ChromeWebView") {
|
"web_view_autofill_inttest.mm",
|
||||||
sources += [
|
"web_view_back_forward_list_inttest.mm",
|
||||||
"navigation_delegate_inttest.mm",
|
"web_view_from_wk_web_view_configuration_inttest.mm",
|
||||||
"scroll_view_kvo_inttest.mm",
|
"web_view_inttest.mm",
|
||||||
"ui_delegate_inttest.mm",
|
"web_view_inttest_base.h",
|
||||||
"web_view_autofill_inttest.mm",
|
"web_view_inttest_base.mm",
|
||||||
"web_view_back_forward_list_inttest.mm",
|
"web_view_kvo_inttest.mm",
|
||||||
"web_view_from_wk_web_view_configuration_inttest.mm",
|
"web_view_restorable_state_inttest.mm",
|
||||||
"web_view_inttest.mm",
|
"web_view_script_message_handler_inttest.mm",
|
||||||
"web_view_inttest_base.h",
|
]
|
||||||
"web_view_inttest_base.mm",
|
|
||||||
"web_view_kvo_inttest.mm",
|
|
||||||
"web_view_restorable_state_inttest.mm",
|
|
||||||
"web_view_script_message_handler_inttest.mm",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
":test_support",
|
":test_support",
|
||||||
|
@ -200,8 +200,6 @@ def main():
|
|||||||
help='Prevents adding use_goma=true to the gn args.')
|
help='Prevents adding use_goma=true to the gn args.')
|
||||||
parser.add_argument('--ninja_args',
|
parser.add_argument('--ninja_args',
|
||||||
help='Additional gn args to pass through to ninja.')
|
help='Additional gn args to pass through to ninja.')
|
||||||
parser.add_argument('--include_cronet', action='store_true',
|
|
||||||
help='Combines Cronet and ChromeWebView as 1 framework.')
|
|
||||||
build_configs = ['Debug', 'Release']
|
build_configs = ['Debug', 'Release']
|
||||||
target_devices = ['iphonesimulator', 'iphoneos']
|
target_devices = ['iphonesimulator', 'iphoneos']
|
||||||
parser.add_argument('--build_configs', nargs='+', default=build_configs,
|
parser.add_argument('--build_configs', nargs='+', default=build_configs,
|
||||||
@ -228,12 +226,6 @@ def main():
|
|||||||
extra_gn_options = []
|
extra_gn_options = []
|
||||||
if not options.no_goma:
|
if not options.no_goma:
|
||||||
extra_gn_options.append('use_goma=true')
|
extra_gn_options.append('use_goma=true')
|
||||||
if options.include_cronet:
|
|
||||||
extra_gn_options.append('ios_web_view_include_cronet=true')
|
|
||||||
output_name = 'CronetChromeWebView'
|
|
||||||
else:
|
|
||||||
extra_gn_options.append('ios_web_view_include_cronet=false')
|
|
||||||
extra_gn_options.append('ios_web_view_output_name="%s"' % output_name)
|
|
||||||
# This prevents Breakpad from being included in the final binary to avoid
|
# This prevents Breakpad from being included in the final binary to avoid
|
||||||
# duplicate symbols with the client app.
|
# duplicate symbols with the client app.
|
||||||
extra_gn_options.append('use_crash_key_stubs=true')
|
extra_gn_options.append('use_crash_key_stubs=true')
|
||||||
|
Reference in New Issue
Block a user