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

Side by Side Diff: chrome/BUILD.gn

Issue 2287243003: Revert of Enable whitelist generation for official builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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/toolchain/wrapper_utils.py ('k') | chrome/chrome_repack_locales.gni » ('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")
11 import("//build/config/ui.gni") 11 import("//build/config/ui.gni")
12 import("//build/config/win/console_app.gni") 12 import("//build/config/win/console_app.gni")
13 import("//build/config/win/manifest.gni") 13 import("//build/config/win/manifest.gni")
14 import("//chrome/chrome_repack_locales.gni") 14 import("//chrome/chrome_repack_locales.gni")
15 import("//chrome/common/features.gni") 15 import("//chrome/common/features.gni")
16 import("//chrome/version.gni") 16 import("//chrome/version.gni")
17 import("//ui/base/ui_features.gni") 17 import("//ui/base/ui_features.gni")
18 import("//v8/gni/v8.gni") 18 import("//v8/gni/v8.gni")
19 19
20 if (enable_resource_whitelist_generation) {
21 android_resource_whitelist = "$root_gen_dir/chrome/resource_whitelist.txt"
22 }
23
24 if (is_android) { 20 if (is_android) {
25 import("//build/config/android/rules.gni") 21 import("//build/config/android/rules.gni")
26 } else if (is_mac) { 22 } else if (is_mac) {
27 import("//build/compiled_action.gni") 23 import("//build/compiled_action.gni")
28 import("//build/config/mac/rules.gni") 24 import("//build/config/mac/rules.gni")
29 import("//build/config/mac/symbols.gni") 25 import("//build/config/mac/symbols.gni")
30 import("//build/mac/tweak_info_plist.gni") 26 import("//build/mac/tweak_info_plist.gni")
31 import("//build/util/branding.gni") 27 import("//build/util/branding.gni")
32 import("//build/util/version.gni") 28 import("//build/util/version.gni")
33 import("//build_overrides/v8.gni") 29 import("//build_overrides/v8.gni")
(...skipping 1418 matching lines...) Expand 10 before | Expand all | Expand 10 after
1452 } 1448 }
1453 1449
1454 # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms 1450 # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms
1455 # it them copies it. This skipes the copy step and writes it to the final 1451 # it them copies it. This skipes the copy step and writes it to the final
1456 # location. 1452 # location.
1457 if (is_mac || is_ios) { 1453 if (is_mac || is_ios) {
1458 output = "$root_gen_dir/repack/resources.pak" 1454 output = "$root_gen_dir/repack/resources.pak"
1459 } else { 1455 } else {
1460 output = "$root_out_dir/resources.pak" 1456 output = "$root_out_dir/resources.pak"
1461 } 1457 }
1462
1463 if (enable_resource_whitelist_generation) {
1464 repack_whitelist = android_resource_whitelist
1465 deps += [ "//chrome:resource_whitelist" ]
1466 }
1467 } 1458 }
1468 1459
1469 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak 1460 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak
1470 repack("browser_tests_pak") { 1461 repack("browser_tests_pak") {
1471 sources = [ 1462 sources = [
1472 "$root_gen_dir/chrome/options_test_resources.pak", 1463 "$root_gen_dir/chrome/options_test_resources.pak",
1473 "$root_gen_dir/chrome/webui_test_resources.pak", 1464 "$root_gen_dir/chrome/webui_test_resources.pak",
1474 ] 1465 ]
1475 output = "$root_out_dir/browser_tests.pak" 1466 output = "$root_out_dir/browser_tests.pak"
1476 deps = [ 1467 deps = [
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
1571 if (enable_extensions) { 1562 if (enable_extensions) {
1572 sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${perc ent}_percent.pak" ] 1563 sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${perc ent}_percent.pak" ]
1573 deps += [ "//extensions:extensions_browser_resources" ] 1564 deps += [ "//extensions:extensions_browser_resources" ]
1574 } 1565 }
1575 if (enable_app_list) { 1566 if (enable_app_list) {
1576 sources += [ "$root_gen_dir/ui/app_list/resources/app_list_resources_${per cent}_percent.pak" ] 1567 sources += [ "$root_gen_dir/ui/app_list/resources/app_list_resources_${per cent}_percent.pak" ]
1577 deps += [ "//ui/app_list/resources" ] 1568 deps += [ "//ui/app_list/resources" ]
1578 } 1569 }
1579 1570
1580 output = repack_output_file 1571 output = repack_output_file
1581
1582 if (enable_resource_whitelist_generation) {
1583 repack_whitelist = android_resource_whitelist
1584 deps += [ "//chrome:resource_whitelist" ]
1585 }
1586 } 1572 }
1587 1573
1588 copy(copy_name) { 1574 copy(copy_name) {
1589 visibility = [ ":*" ] 1575 visibility = [ ":*" ]
1590 deps = [ 1576 deps = [
1591 ":$repack_name", 1577 ":$repack_name",
1592 ] 1578 ]
1593 sources = [ 1579 sources = [
1594 repack_output_file, 1580 repack_output_file,
1595 ] 1581 ]
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
1689 "//chrome/common", 1675 "//chrome/common",
1690 "//chrome/gpu", 1676 "//chrome/gpu",
1691 "//chrome/renderer", 1677 "//chrome/renderer",
1692 "//chrome/utility", 1678 "//chrome/utility",
1693 "//components/safe_browsing_db:safe_browsing_db_mobile", 1679 "//components/safe_browsing_db:safe_browsing_db_mobile",
1694 "//content/public/app:both", 1680 "//content/public/app:both",
1695 ] 1681 ]
1696 } 1682 }
1697 } 1683 }
1698 1684
1699 if (enable_resource_whitelist_generation) {
1700 action("resource_whitelist") {
1701 deps = [
1702 "//chrome/android:chrome",
1703 ]
1704 script = "//tools/resources/generate_resource_whitelist.py"
1705
1706 _infile = "$root_out_dir/libchrome$shlib_extension.whitelist"
1707 inputs = [
1708 _infile,
1709 ]
1710
1711 _outfile = android_resource_whitelist
1712 outputs = [
1713 _outfile,
1714 ]
1715
1716 args = [
1717 "-i",
1718 rebase_path(_infile, root_build_dir),
1719 "-o",
1720 rebase_path(_outfile, root_build_dir),
1721 "--out-dir=.",
1722 ]
1723 }
1724 }
1725
1726 if (is_linux) { 1685 if (is_linux) {
1727 action("manpage") { 1686 action("manpage") {
1728 if (is_chrome_branded) { 1687 if (is_chrome_branded) {
1729 name = "Google Chrome" 1688 name = "Google Chrome"
1730 filename = "google-chrome" 1689 filename = "google-chrome"
1731 confdir = "google-chrome" 1690 confdir = "google-chrome"
1732 } else { 1691 } else {
1733 name = "Chromium" 1692 name = "Chromium"
1734 filename = "chromium-browser" 1693 filename = "chromium-browser"
1735 confdir = "chromium" 1694 confdir = "chromium"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
1799 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1758 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1800 "//chrome/tools/build/linux/chrome-wrapper", 1759 "//chrome/tools/build/linux/chrome-wrapper",
1801 "//third_party/xdg-utils/scripts/xdg-mime", 1760 "//third_party/xdg-utils/scripts/xdg-mime",
1802 "//third_party/xdg-utils/scripts/xdg-settings", 1761 "//third_party/xdg-utils/scripts/xdg-settings",
1803 ] 1762 ]
1804 outputs = [ 1763 outputs = [
1805 "$root_out_dir/{{source_file_part}}", 1764 "$root_out_dir/{{source_file_part}}",
1806 ] 1765 ]
1807 } 1766 }
1808 } 1767 }
OLDNEW
« no previous file with comments | « build/toolchain/wrapper_utils.py ('k') | chrome/chrome_repack_locales.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698