Commit 5844e411 authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

weblayer: gets gn check working for weblayer

I had to change //component/version_info as generate_version_info
is not externally visibile and should be a public_dep of version_info.

BUG=none
TEST=none

Change-Id: I8e27071b70f5c888eb33456283b7794bb166e270
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1790745Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695322}
parent 23a8135b
...@@ -597,6 +597,8 @@ check_targets = [ ...@@ -597,6 +597,8 @@ check_targets = [
"//url/*", "//url/*",
#"//v8/*", # Errors: https://bugs.chromium.org/p/v8/issues/detail?id=7330 #"//v8/*", # Errors: https://bugs.chromium.org/p/v8/issues/detail?id=7330
"//weblayer/*",
] ]
# These are the list of GN files that run exec_script. This whitelist exists # These are the list of GN files that run exec_script. This whitelist exists
......
...@@ -18,7 +18,6 @@ static_library("version_info") { ...@@ -18,7 +18,6 @@ static_library("version_info") {
] ]
deps = [ deps = [
":generate_version_info",
"//base", "//base",
"//base:sanitizer_buildflags", "//base:sanitizer_buildflags",
"//build:branding_buildflags", "//build:branding_buildflags",
...@@ -26,6 +25,7 @@ static_library("version_info") { ...@@ -26,6 +25,7 @@ static_library("version_info") {
public_deps = [ public_deps = [
":channel", ":channel",
":generate_version_info",
] ]
} }
......
...@@ -80,12 +80,14 @@ jumbo_static_library("weblayer_lib") { ...@@ -80,12 +80,14 @@ jumbo_static_library("weblayer_lib") {
"//content/app/resources", "//content/app/resources",
"//content/app/strings", "//content/app/strings",
"//content/public/app:both", "//content/public/app:both",
"//content/public/child:child", "//content/public/browser",
"//content/public/child",
"//content/public/common", "//content/public/common",
"//content/public/common:service_names", "//content/public/common:service_names",
"//net", "//net",
"//net:net_resources", "//net:net_resources",
"//sandbox", "//sandbox",
"//services/service_manager/embedder:embedder_result_codes",
"//skia", "//skia",
"//third_party/icu", "//third_party/icu",
"//ui/base", "//ui/base",
...@@ -130,6 +132,7 @@ jumbo_static_library("weblayer_lib") { ...@@ -130,6 +132,7 @@ jumbo_static_library("weblayer_lib") {
if (is_android) { if (is_android) {
deps += [ deps += [
"//components/version_info",
"//ui/android", "//ui/android",
"//weblayer/browser/java:jni", "//weblayer/browser/java:jni",
] ]
...@@ -144,6 +147,9 @@ jumbo_static_library("weblayer_lib") { ...@@ -144,6 +147,9 @@ jumbo_static_library("weblayer_lib") {
"browser/top_controls_container_view.h", "browser/top_controls_container_view.h",
] ]
} }
if (!is_android) {
deps += [ "//ui/views/controls/webview" ]
}
if (toolkit_views) { if (toolkit_views) {
deps += [ "//ui/views" ] deps += [ "//ui/views" ]
......
...@@ -244,7 +244,10 @@ if (is_android) { ...@@ -244,7 +244,10 @@ if (is_android) {
deps = [ deps = [
":pak", ":pak",
":weblayer_shell_lib", ":weblayer_shell_lib",
"//base",
"//build/win:default_exe_manifest", "//build/win:default_exe_manifest",
"//net",
"//weblayer:weblayer_lib",
] ]
data_deps = [ data_deps = [
......
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