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

Side by Side Diff: chrome/BUILD.gn

Issue 2001093002: Revert of Remove enable_topchrome_md build flag (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 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 # TODO(estade): remove material design specific resources. 633 if (enable_topchrome_md) {
634 # See crbug.com/613593
635 if (is_mac) {
636 sources += [ "$root_out_dir/chrome_material_100_percent.pak" ] 634 sources += [ "$root_out_dir/chrome_material_100_percent.pak" ]
637 635
638 if (enable_hidpi) { 636 if (enable_hidpi) {
639 sources += [ "$root_out_dir/chrome_material_200_percent.pak" ] 637 sources += [ "$root_out_dir/chrome_material_200_percent.pak" ]
640 } 638 }
641 } 639 }
642 640
643 if (enable_mac_keystone) { 641 if (enable_mac_keystone) {
644 sources += [ 642 sources += [
645 "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
1073 ] 1071 ]
1074 1072
1075 if (is_chrome_branded && !is_mac) { 1073 if (is_chrome_branded && !is_mac) {
1076 public_deps += [ ":default_apps" ] 1074 public_deps += [ ":default_apps" ]
1077 } 1075 }
1078 1076
1079 if (enable_hidpi) { 1077 if (enable_hidpi) {
1080 public_deps += [ ":repack_chrome_200_percent" ] 1078 public_deps += [ ":repack_chrome_200_percent" ]
1081 } 1079 }
1082 1080
1083 if (is_mac) { 1081 if (enable_topchrome_md) {
1084 public_deps += [ ":repack_chrome_material_100_percent" ] 1082 public_deps += [ ":repack_chrome_material_100_percent" ]
1085 1083
1086 if (enable_hidpi) { 1084 if (enable_hidpi) {
1087 public_deps += [ ":repack_chrome_material_200_percent" ] 1085 public_deps += [ ":repack_chrome_material_200_percent" ]
1088 } 1086 }
1089 } 1087 }
1090 } 1088 }
1091 1089
1092 repack("packed_extra_resources") { 1090 repack("packed_extra_resources") {
1093 visibility = [ "./*" ] 1091 visibility = [ "./*" ]
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
1329 "$root_gen_dir/repack/chrome_material_${percent}_percent.pak" 1327 "$root_gen_dir/repack/chrome_material_${percent}_percent.pak"
1330 1328
1331 copy_name = target_name 1329 copy_name = target_name
1332 1330
1333 repack(repack_name) { 1331 repack(repack_name) {
1334 visibility = [ ":$copy_name" ] 1332 visibility = [ ":$copy_name" ]
1335 1333
1336 # All sources should also have deps for completeness. 1334 # All sources should also have deps for completeness.
1337 sources = [ 1335 sources = [
1338 "$root_gen_dir/chrome/theme_resources_material_${percent}_percent.pak", 1336 "$root_gen_dir/chrome/theme_resources_material_${percent}_percent.pak",
1337 "$root_gen_dir/components/components_resources_material_${percent}_percent .pak",
1339 ] 1338 ]
1340 1339
1341 deps = [ 1340 deps = [
1342 "//chrome/app/theme:theme_resources", 1341 "//chrome/app/theme:theme_resources",
1343 "//components/resources", 1342 "//components/resources",
1344 ] 1343 ]
1345 1344
1346 output = repack_output_file 1345 output = repack_output_file
1347 } 1346 }
1348 1347
1349 copy(copy_name) { 1348 copy(copy_name) {
1350 visibility = [ ":*" ] 1349 visibility = [ ":*" ]
1351 deps = [ 1350 deps = [
1352 ":$repack_name", 1351 ":$repack_name",
1353 ] 1352 ]
1354 sources = [ 1353 sources = [
1355 repack_output_file, 1354 repack_output_file,
1356 ] 1355 ]
1357 outputs = [ 1356 outputs = [
1358 "$root_build_dir/chrome_material_${percent}_percent.pak", 1357 "$root_build_dir/chrome_material_${percent}_percent.pak",
1359 ] 1358 ]
1360 } 1359 }
1361 } 1360 }
1362 1361
1363 if (is_mac) { 1362 if (enable_topchrome_md) {
1364 chrome_repack_material_percent("repack_chrome_material_100_percent") { 1363 chrome_repack_material_percent("repack_chrome_material_100_percent") {
1365 percent = "100" 1364 percent = "100"
1366 } 1365 }
1367 1366
1368 if (enable_hidpi) { 1367 if (enable_hidpi) {
1369 chrome_repack_material_percent("repack_chrome_material_200_percent") { 1368 chrome_repack_material_percent("repack_chrome_material_200_percent") {
1370 percent = "200" 1369 percent = "200"
1371 } 1370 }
1372 } 1371 }
1373 } 1372 }
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
1538 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1537 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1539 "//chrome/tools/build/linux/chrome-wrapper", 1538 "//chrome/tools/build/linux/chrome-wrapper",
1540 "//third_party/xdg-utils/scripts/xdg-mime", 1539 "//third_party/xdg-utils/scripts/xdg-mime",
1541 "//third_party/xdg-utils/scripts/xdg-settings", 1540 "//third_party/xdg-utils/scripts/xdg-settings",
1542 ] 1541 ]
1543 outputs = [ 1542 outputs = [
1544 "$root_out_dir/{{source_file_part}}", 1543 "$root_out_dir/{{source_file_part}}",
1545 ] 1544 ]
1546 } 1545 }
1547 } 1546 }
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