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

Unified Diff: chrome/test/BUILD.gn

Issue 2004143002: Retry of 2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « chrome/interactive_ui_tests.isolate ('k') | chrome/tools/build/chromeos/FILES.cfg » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 3d87f407edd1623b6ab0a9c703c23df13208ada2..70e2f341fa1b13ed93d4fb364cb172e340a1a98c 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -350,9 +350,7 @@ if (!is_android) {
if (is_linux || is_win) {
data += [
"$root_out_dir/chrome_100_percent.pak",
- "$root_out_dir/chrome_material_100_percent.pak",
"$root_out_dir/chrome_200_percent.pak",
- "$root_out_dir/chrome_material_200_percent.pak",
"$root_out_dir/locales/en-US.pak",
"$root_out_dir/locales/fr.pak",
]
@@ -887,9 +885,7 @@ if (!is_android) {
"$root_out_dir/pyproto/",
"$root_out_dir/browser_tests.pak",
"$root_out_dir/chrome_100_percent.pak",
- "$root_out_dir/chrome_material_100_percent.pak",
"$root_out_dir/chrome_200_percent.pak",
- "$root_out_dir/chrome_material_200_percent.pak",
"$root_out_dir/remoting/unittests/",
"$root_out_dir/resources/extension/",
"$root_out_dir/test_case.html",
@@ -902,6 +898,12 @@ if (!is_android) {
if (is_win) {
data += [ "$root_out_dir/chrome_200_percent.pak" ]
}
+ if (is_mac) {
+ data += [
+ "$root_out_dir/chrome_material_100_percent.pak",
+ "$root_out_dir/chrome_material_200_percent.pak",
+ ]
+ }
deps = [
":browser_tests_js_webui",
@@ -1452,9 +1454,7 @@ if (!is_android) {
if (is_linux || is_win) {
data += [
"$root_out_dir/chrome_100_percent.pak",
- "$root_out_dir/chrome_material_100_percent.pak",
"$root_out_dir/chrome_200_percent.pak",
- "$root_out_dir/chrome_material_200_percent.pak",
"$root_out_dir/locales/en-US.pak",
]
}
@@ -1676,11 +1676,7 @@ test("unit_tests") {
]
}
if (is_linux || is_win) {
- data += [
- "$root_out_dir/chrome_200_percent.pak",
- "$root_out_dir/chrome_material_100_percent.pak",
- "$root_out_dir/chrome_material_200_percent.pak",
- ]
+ data += [ "$root_out_dir/chrome_200_percent.pak" ]
}
defines = []
« no previous file with comments | « chrome/interactive_ui_tests.isolate ('k') | chrome/tools/build/chromeos/FILES.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698