Index: headless/BUILD.gn |
diff --git a/headless/BUILD.gn b/headless/BUILD.gn |
index 2d83fadcc35e60c8e30cd7bdae08ed9e04e70247..c3835a4962ff4e55c6ef19fde8d25e3826749d80 100644 |
--- a/headless/BUILD.gn |
+++ b/headless/BUILD.gn |
@@ -18,9 +18,9 @@ config("headless_implementation") { |
} |
} |
-group("headless") { |
+group("headless_lib") { |
deps = [ |
- "//headless:headless_lib", |
+ "//headless:headless", |
] |
} |
@@ -188,7 +188,7 @@ action("gen_devtools_client_api") { |
] |
} |
-static_library("headless_lib") { |
+component("headless") { |
Sami
2017/03/27 14:07:58
Can we still call this headless_lib? That's the co
dvallet
2017/03/28 02:35:59
From the component doc, it looks like it's prefera
Sami
2017/03/28 11:49:32
Okay, let's follow established convention then.
|
sources = generated_devtools_api + [ |
"lib/browser/headless_browser_context_impl.cc", |
"lib/browser/headless_browser_context_impl.h", |
@@ -292,9 +292,6 @@ static_library("headless_lib") { |
"//components/crash/content/browser", |
"//components/security_state/content", |
"//components/security_state/core", |
- "//content/public/app:both", |
- "//content/public/browser", |
- "//content/public/child:child", |
"//content/public/common", |
"//content/public/common:service_names", |
"//net", |
@@ -350,9 +347,10 @@ test("headless_unittests") { |
] |
deps = [ |
- ":headless_lib", |
+ ":headless", |
"//base/test:run_all_unittests", |
"//base/test:test_support", |
+ "//net", |
"//testing/gmock", |
"//testing/gtest", |
] |
@@ -427,7 +425,7 @@ test("headless_browsertests") { |
":headless_browser_tests_pak", |
"//base", |
"//content/test:test_support", |
- "//headless:headless_lib", |
+ "//headless:headless", |
"//testing/gmock", |
"//testing/gtest", |
] |
@@ -445,30 +443,45 @@ static_library("headless_shell_lib") { |
] |
deps = [ |
- "//headless:headless_lib", |
+ ":headless", |
+ "//content/public/browser", |
+ "//content/public/common", |
] |
- configs += [ ":headless_implementation" ] |
+ if (is_win) { |
+ deps += [ |
+ "//content:sandbox_helper_win", |
+ "//sandbox", |
+ ] |
+ } |
} |
-executable("headless_shell") { |
+static_library("headless_shell_child_lib") { |
Sami
2017/03/27 14:07:58
Is "child" the right name to be using here since c
dvallet
2017/03/28 02:35:59
This is only linked in chrome_child DLL, that's wh
Sami
2017/03/28 11:49:32
Ah, a little confusing but okay :)
|
sources = [ |
- "app/headless_shell_main.cc", |
+ "app/headless_shell.cc", |
+ "app/headless_shell.h", |
+ "app/headless_shell_switches.cc", |
+ "app/headless_shell_switches.h", |
+ "app/shell_navigation_request.cc", |
+ "app/shell_navigation_request.h", |
+ "public/headless_shell.h", |
] |
deps = [ |
- "//headless:headless_shell_lib", |
+ ":headless", |
+ "//content/public/child:child", |
Sami
2017/03/27 14:07:58
Where's this dependency coming from? I didn't find
dvallet
2017/03/28 02:35:59
This pools the Ppapi plugging, I found it fitting
|
] |
+} |
- if (is_win) { |
- deps += [ |
- "//build/win:default_exe_manifest", |
- "//content:sandbox_helper_win", |
- "//sandbox", |
- ] |
- } |
+executable("headless_shell") { |
+ sources = [ |
+ "app/headless_shell_main.cc", |
+ ] |
- configs += [ ":headless_implementation" ] |
+ deps = [ |
+ ":headless_shell_lib", |
+ "//content/public/app:both", |
+ ] |
} |
process_version("version_header") { |
@@ -486,6 +499,7 @@ executable("headless_example") { |
] |
deps = [ |
- "//headless:headless_shell_lib", |
+ ":headless_shell_lib", |
+ "//content/public/app:both", |
] |
} |