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

Side by Side Diff: chrome/BUILD.gn

Issue 2209763002: Revert of Enable whitelist generation for all builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 = "$target_gen_dir/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 1445 matching lines...) Expand 10 before | Expand all | Expand 10 after
1479 } 1475 }
1480 1476
1481 # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms 1477 # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms
1482 # it them copies it. This skipes the copy step and writes it to the final 1478 # it them copies it. This skipes the copy step and writes it to the final
1483 # location. 1479 # location.
1484 if (is_mac || is_ios) { 1480 if (is_mac || is_ios) {
1485 output = "$root_gen_dir/repack/resources.pak" 1481 output = "$root_gen_dir/repack/resources.pak"
1486 } else { 1482 } else {
1487 output = "$root_out_dir/resources.pak" 1483 output = "$root_out_dir/resources.pak"
1488 } 1484 }
1489
1490 if (enable_resource_whitelist_generation) {
1491 repack_whitelist = android_resource_whitelist
1492 deps += [ "//chrome:resource_whitelist" ]
1493 }
1494 } 1485 }
1495 1486
1496 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak 1487 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak
1497 repack("browser_tests_pak") { 1488 repack("browser_tests_pak") {
1498 sources = [ 1489 sources = [
1499 "$root_gen_dir/chrome/options_test_resources.pak", 1490 "$root_gen_dir/chrome/options_test_resources.pak",
1500 "$root_gen_dir/chrome/webui_test_resources.pak", 1491 "$root_gen_dir/chrome/webui_test_resources.pak",
1501 ] 1492 ]
1502 output = "$root_out_dir/browser_tests.pak" 1493 output = "$root_out_dir/browser_tests.pak"
1503 deps = [ 1494 deps = [
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
1598 if (enable_extensions) { 1589 if (enable_extensions) {
1599 sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${perc ent}_percent.pak" ] 1590 sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${perc ent}_percent.pak" ]
1600 deps += [ "//extensions:extensions_browser_resources" ] 1591 deps += [ "//extensions:extensions_browser_resources" ]
1601 } 1592 }
1602 if (enable_app_list) { 1593 if (enable_app_list) {
1603 sources += [ "$root_gen_dir/ui/app_list/resources/app_list_resources_${per cent}_percent.pak" ] 1594 sources += [ "$root_gen_dir/ui/app_list/resources/app_list_resources_${per cent}_percent.pak" ]
1604 deps += [ "//ui/app_list/resources" ] 1595 deps += [ "//ui/app_list/resources" ]
1605 } 1596 }
1606 1597
1607 output = repack_output_file 1598 output = repack_output_file
1608
1609 if (enable_resource_whitelist_generation) {
1610 repack_whitelist = android_resource_whitelist
1611 deps += [ "//chrome:resource_whitelist" ]
1612 }
1613 } 1599 }
1614 1600
1615 copy(copy_name) { 1601 copy(copy_name) {
1616 visibility = [ ":*" ] 1602 visibility = [ ":*" ]
1617 deps = [ 1603 deps = [
1618 ":$repack_name", 1604 ":$repack_name",
1619 ] 1605 ]
1620 sources = [ 1606 sources = [
1621 repack_output_file, 1607 repack_output_file,
1622 ] 1608 ]
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1770 "//chrome/common", 1756 "//chrome/common",
1771 "//chrome/gpu", 1757 "//chrome/gpu",
1772 "//chrome/renderer", 1758 "//chrome/renderer",
1773 "//chrome/utility", 1759 "//chrome/utility",
1774 "//components/safe_browsing_db:safe_browsing_db_mobile", 1760 "//components/safe_browsing_db:safe_browsing_db_mobile",
1775 "//content/public/app:both", 1761 "//content/public/app:both",
1776 ] 1762 ]
1777 } 1763 }
1778 } 1764 }
1779 1765
1780 if (enable_resource_whitelist_generation) {
1781 action("resource_whitelist") {
1782 deps = [
1783 "//chrome/android:chrome",
1784 ]
1785 script = "//tools/resources/generate_resource_whitelist.py"
1786
1787 _infile = "$root_out_dir/libchrome.cr.so.whitelist"
1788 inputs = [
1789 _infile,
1790 ]
1791
1792 _outfile = android_resource_whitelist
1793 outputs = [
1794 _outfile,
1795 ]
1796
1797 args = [
1798 "-i",
1799 rebase_path(_infile, root_build_dir),
1800 "-o",
1801 rebase_path(_outfile, root_build_dir),
1802 "--out-dir=.",
1803 ]
1804 }
1805 }
1806
1807 if (is_linux) { 1766 if (is_linux) {
1808 action("manpage") { 1767 action("manpage") {
1809 if (is_chrome_branded) { 1768 if (is_chrome_branded) {
1810 name = "Google Chrome" 1769 name = "Google Chrome"
1811 filename = "google-chrome" 1770 filename = "google-chrome"
1812 confdir = "google-chrome" 1771 confdir = "google-chrome"
1813 } else { 1772 } else {
1814 name = "Chromium" 1773 name = "Chromium"
1815 filename = "chromium-browser" 1774 filename = "chromium-browser"
1816 confdir = "chromium" 1775 confdir = "chromium"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
1880 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1839 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1881 "//chrome/tools/build/linux/chrome-wrapper", 1840 "//chrome/tools/build/linux/chrome-wrapper",
1882 "//third_party/xdg-utils/scripts/xdg-mime", 1841 "//third_party/xdg-utils/scripts/xdg-mime",
1883 "//third_party/xdg-utils/scripts/xdg-settings", 1842 "//third_party/xdg-utils/scripts/xdg-settings",
1884 ] 1843 ]
1885 outputs = [ 1844 outputs = [
1886 "$root_out_dir/{{source_file_part}}", 1845 "$root_out_dir/{{source_file_part}}",
1887 ] 1846 ]
1888 } 1847 }
1889 } 1848 }
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