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

Side by Side Diff: chrome/BUILD.gn

Issue 1991573002: Remove enable_topchrome_md build flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 unified diff | Download patch
« no previous file with comments | « build/config/ui.gni ('k') | chrome/app/theme/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
7 import("//build/config/compiler/compiler.gni") 7 import("//build/config/compiler/compiler.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/locales.gni") 9 import("//build/config/locales.gni")
10 import("//build/config/sanitizers/sanitizers.gni") 10 import("//build/config/sanitizers/sanitizers.gni")
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 ":packed_extra_resources", 623 ":packed_extra_resources",
624 ":packed_resources", 624 ":packed_resources",
625 "//chrome/app_shim:app_mode_loader", 625 "//chrome/app_shim:app_mode_loader",
626 "//third_party/icu:icudata", 626 "//third_party/icu:icudata",
627 ] 627 ]
628 628
629 if (enable_hidpi) { 629 if (enable_hidpi) {
630 sources += [ "$root_out_dir/chrome_200_percent.pak" ] 630 sources += [ "$root_out_dir/chrome_200_percent.pak" ]
631 } 631 }
632 632
633 if (enable_topchrome_md) { 633 # TODO(estade): remove material design specific resources.
634 # See crbug.com/613593
635 if (is_mac) {
634 sources += [ "$root_out_dir/chrome_material_100_percent.pak" ] 636 sources += [ "$root_out_dir/chrome_material_100_percent.pak" ]
635 637
636 if (enable_hidpi) { 638 if (enable_hidpi) {
637 sources += [ "$root_out_dir/chrome_material_200_percent.pak" ] 639 sources += [ "$root_out_dir/chrome_material_200_percent.pak" ]
638 } 640 }
639 } 641 }
640 642
641 if (enable_mac_keystone) { 643 if (enable_mac_keystone) {
642 sources += [ 644 sources += [
643 "browser/mac/keystone_promote_postflight.sh", 645 "browser/mac/keystone_promote_postflight.sh",
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
1071 ] 1073 ]
1072 1074
1073 if (is_chrome_branded && !is_mac) { 1075 if (is_chrome_branded && !is_mac) {
1074 public_deps += [ ":default_apps" ] 1076 public_deps += [ ":default_apps" ]
1075 } 1077 }
1076 1078
1077 if (enable_hidpi) { 1079 if (enable_hidpi) {
1078 public_deps += [ ":repack_chrome_200_percent" ] 1080 public_deps += [ ":repack_chrome_200_percent" ]
1079 } 1081 }
1080 1082
1081 if (enable_topchrome_md) { 1083 if (is_mac) {
1082 public_deps += [ ":repack_chrome_material_100_percent" ] 1084 public_deps += [ ":repack_chrome_material_100_percent" ]
1083 1085
1084 if (enable_hidpi) { 1086 if (enable_hidpi) {
1085 public_deps += [ ":repack_chrome_material_200_percent" ] 1087 public_deps += [ ":repack_chrome_material_200_percent" ]
1086 } 1088 }
1087 } 1089 }
1088 } 1090 }
1089 1091
1090 repack("packed_extra_resources") { 1092 repack("packed_extra_resources") {
1091 visibility = [ "./*" ] 1093 visibility = [ "./*" ]
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 "$root_gen_dir/repack/chrome_material_${percent}_percent.pak" 1329 "$root_gen_dir/repack/chrome_material_${percent}_percent.pak"
1328 1330
1329 copy_name = target_name 1331 copy_name = target_name
1330 1332
1331 repack(repack_name) { 1333 repack(repack_name) {
1332 visibility = [ ":$copy_name" ] 1334 visibility = [ ":$copy_name" ]
1333 1335
1334 # All sources should also have deps for completeness. 1336 # All sources should also have deps for completeness.
1335 sources = [ 1337 sources = [
1336 "$root_gen_dir/chrome/theme_resources_material_${percent}_percent.pak", 1338 "$root_gen_dir/chrome/theme_resources_material_${percent}_percent.pak",
1337 "$root_gen_dir/components/components_resources_material_${percent}_percent .pak",
1338 ] 1339 ]
1339 1340
1340 deps = [ 1341 deps = [
1341 "//chrome/app/theme:theme_resources", 1342 "//chrome/app/theme:theme_resources",
1342 "//components/resources", 1343 "//components/resources",
1343 ] 1344 ]
1344 1345
1345 output = repack_output_file 1346 output = repack_output_file
1346 } 1347 }
1347 1348
1348 copy(copy_name) { 1349 copy(copy_name) {
1349 visibility = [ ":*" ] 1350 visibility = [ ":*" ]
1350 deps = [ 1351 deps = [
1351 ":$repack_name", 1352 ":$repack_name",
1352 ] 1353 ]
1353 sources = [ 1354 sources = [
1354 repack_output_file, 1355 repack_output_file,
1355 ] 1356 ]
1356 outputs = [ 1357 outputs = [
1357 "$root_build_dir/chrome_material_${percent}_percent.pak", 1358 "$root_build_dir/chrome_material_${percent}_percent.pak",
1358 ] 1359 ]
1359 } 1360 }
1360 } 1361 }
1361 1362
1362 if (enable_topchrome_md) { 1363 if (is_mac) {
1363 chrome_repack_material_percent("repack_chrome_material_100_percent") { 1364 chrome_repack_material_percent("repack_chrome_material_100_percent") {
1364 percent = "100" 1365 percent = "100"
1365 } 1366 }
1366 1367
1367 if (enable_hidpi) { 1368 if (enable_hidpi) {
1368 chrome_repack_material_percent("repack_chrome_material_200_percent") { 1369 chrome_repack_material_percent("repack_chrome_material_200_percent") {
1369 percent = "200" 1370 percent = "200"
1370 } 1371 }
1371 } 1372 }
1372 } 1373 }
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1538 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1538 "//chrome/tools/build/linux/chrome-wrapper", 1539 "//chrome/tools/build/linux/chrome-wrapper",
1539 "//third_party/xdg-utils/scripts/xdg-mime", 1540 "//third_party/xdg-utils/scripts/xdg-mime",
1540 "//third_party/xdg-utils/scripts/xdg-settings", 1541 "//third_party/xdg-utils/scripts/xdg-settings",
1541 ] 1542 ]
1542 outputs = [ 1543 outputs = [
1543 "$root_out_dir/{{source_file_part}}", 1544 "$root_out_dir/{{source_file_part}}",
1544 ] 1545 ]
1545 } 1546 }
1546 } 1547 }
OLDNEW
« no previous file with comments | « build/config/ui.gni ('k') | chrome/app/theme/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698