Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1477)

Unified Diff: content/shell/BUILD.gn

Issue 1882533004: 🐍 Fix GN deps needed by third_party/WebKit/Tools/Scripts/run-webkit-tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/BUILD.gn
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 739c090053c88b761b0ed18b68a39808e42f088b..e12ee811abc3f7d38ffc1effb0590656169db492 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -419,9 +419,21 @@ repack("pak") {
output = "$root_out_dir/content_shell.pak"
}
-# TODO(GYP): Figure out what this should be on android
-# and make linking this work on the Mac.
-if (!is_android && !is_mac) {
+if (is_android) {
+ group("content_shell") {
+ testonly = true
+ deps = [
+ "//content/shell/android:content_shell_apk",
+ ]
+ }
+} else if (is_mac) {
+ group("content_shell") {
+ testonly = true
+ deps = [
+ ":content_shell_lib",
+ ]
+ }
+} else {
# TODO(brettw) when GYP is no longer necessary, delete
# content/shell/app/shell.exe.manifest. This file is not used in GN.
executable("content_shell") {
@@ -464,26 +476,11 @@ if (!is_android && !is_mac) {
]
}
- if (is_android) {
- # Some tests rely on this tool. It might be nicer if these tests relied on
- # image diff rather than having content shell depend on it.
- data_deps = [
- "//tools/imagediff($host_toolchain)",
- ]
- }
-
if (is_linux && !is_component_build) {
# Set rpath to find our own libfreetype even in a non-component build.
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
}
-} else {
- group("content_shell") {
- testonly = true
- deps = [
- ":content_shell_lib",
- ]
- }
}
if (is_win) {

Powered by Google App Engine
This is Rietveld 408576698