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

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: delete empty conditions 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 if (is_mac) {
sky 2016/05/19 23:11:58 I was confused by these checks, until I understood
Evan Stade 2016/05/19 23:20:10 They're going away even on mac, so is_mac is tempo
sky 2016/05/20 16:27:54 I // TODO(estade): temporary, will remove soon, se
Evan Stade 2016/05/20 16:54:51 Done.
634 sources += [ "$root_out_dir/chrome_material_100_percent.pak" ] 634 sources += [ "$root_out_dir/chrome_material_100_percent.pak" ]
635 635
636 if (enable_hidpi) { 636 if (enable_hidpi) {
637 sources += [ "$root_out_dir/chrome_material_200_percent.pak" ] 637 sources += [ "$root_out_dir/chrome_material_200_percent.pak" ]
638 } 638 }
639 } 639 }
640 640
641 if (enable_mac_keystone) { 641 if (enable_mac_keystone) {
642 sources += [ 642 sources += [
643 "browser/mac/keystone_promote_postflight.sh", 643 "browser/mac/keystone_promote_postflight.sh",
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
1071 ] 1071 ]
1072 1072
1073 if (is_chrome_branded && !is_mac) { 1073 if (is_chrome_branded && !is_mac) {
1074 public_deps += [ ":default_apps" ] 1074 public_deps += [ ":default_apps" ]
1075 } 1075 }
1076 1076
1077 if (enable_hidpi) { 1077 if (enable_hidpi) {
1078 public_deps += [ ":repack_chrome_200_percent" ] 1078 public_deps += [ ":repack_chrome_200_percent" ]
1079 } 1079 }
1080 1080
1081 if (enable_topchrome_md) { 1081 if (is_mac) {
1082 public_deps += [ ":repack_chrome_material_100_percent" ] 1082 public_deps += [ ":repack_chrome_material_100_percent" ]
1083 1083
1084 if (enable_hidpi) { 1084 if (enable_hidpi) {
1085 public_deps += [ ":repack_chrome_material_200_percent" ] 1085 public_deps += [ ":repack_chrome_material_200_percent" ]
1086 } 1086 }
1087 } 1087 }
1088 } 1088 }
1089 1089
1090 repack("packed_extra_resources") { 1090 repack("packed_extra_resources") {
1091 visibility = [ "./*" ] 1091 visibility = [ "./*" ]
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 "$root_gen_dir/repack/chrome_material_${percent}_percent.pak" 1322 "$root_gen_dir/repack/chrome_material_${percent}_percent.pak"
1323 1323
1324 copy_name = target_name 1324 copy_name = target_name
1325 1325
1326 repack(repack_name) { 1326 repack(repack_name) {
1327 visibility = [ ":$copy_name" ] 1327 visibility = [ ":$copy_name" ]
1328 1328
1329 # All sources should also have deps for completeness. 1329 # All sources should also have deps for completeness.
1330 sources = [ 1330 sources = [
1331 "$root_gen_dir/chrome/theme_resources_material_${percent}_percent.pak", 1331 "$root_gen_dir/chrome/theme_resources_material_${percent}_percent.pak",
1332 "$root_gen_dir/components/components_resources_material_${percent}_percent .pak",
1333 ] 1332 ]
1334 1333
1335 deps = [ 1334 deps = [
1336 "//chrome/app/theme:theme_resources", 1335 "//chrome/app/theme:theme_resources",
1337 "//components/resources", 1336 "//components/resources",
1338 ] 1337 ]
1339 1338
1340 output = repack_output_file 1339 output = repack_output_file
1341 } 1340 }
1342 1341
1343 copy(copy_name) { 1342 copy(copy_name) {
1344 visibility = [ ":*" ] 1343 visibility = [ ":*" ]
1345 deps = [ 1344 deps = [
1346 ":$repack_name", 1345 ":$repack_name",
1347 ] 1346 ]
1348 sources = [ 1347 sources = [
1349 repack_output_file, 1348 repack_output_file,
1350 ] 1349 ]
1351 outputs = [ 1350 outputs = [
1352 "$root_build_dir/chrome_material_${percent}_percent.pak", 1351 "$root_build_dir/chrome_material_${percent}_percent.pak",
1353 ] 1352 ]
1354 } 1353 }
1355 } 1354 }
1356 1355
1357 if (enable_topchrome_md) { 1356 if (is_mac) {
1358 chrome_repack_material_percent("repack_chrome_material_100_percent") { 1357 chrome_repack_material_percent("repack_chrome_material_100_percent") {
1359 percent = "100" 1358 percent = "100"
1360 } 1359 }
1361 1360
1362 if (enable_hidpi) { 1361 if (enable_hidpi) {
1363 chrome_repack_material_percent("repack_chrome_material_200_percent") { 1362 chrome_repack_material_percent("repack_chrome_material_200_percent") {
1364 percent = "200" 1363 percent = "200"
1365 } 1364 }
1366 } 1365 }
1367 } 1366 }
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
1532 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1531 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1533 "//chrome/tools/build/linux/chrome-wrapper", 1532 "//chrome/tools/build/linux/chrome-wrapper",
1534 "//third_party/xdg-utils/scripts/xdg-mime", 1533 "//third_party/xdg-utils/scripts/xdg-mime",
1535 "//third_party/xdg-utils/scripts/xdg-settings", 1534 "//third_party/xdg-utils/scripts/xdg-settings",
1536 ] 1535 ]
1537 outputs = [ 1536 outputs = [
1538 "$root_out_dir/{{source_file_part}}", 1537 "$root_out_dir/{{source_file_part}}",
1539 ] 1538 ]
1540 } 1539 }
1541 } 1540 }
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