summaryrefslogtreecommitdiffstats
path: root/build/secondary
diff options
context:
space:
mode:
authoragrieve <agrieve@chromium.org>2015-11-05 07:40:35 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-05 15:41:17 +0000
commit7a2c6b09316b1fa695fac516c428e8bff068173f (patch)
tree470e2da4e072a864b81d69b4e6c0c67b88b0b52c /build/secondary
parent3aecc1d25d7e78ad0d7cba9b5d750330db529a68 (diff)
downloadchromium_src-7a2c6b09316b1fa695fac516c428e8bff068173f.zip
chromium_src-7a2c6b09316b1fa695fac516c428e8bff068173f.tar.gz
chromium_src-7a2c6b09316b1fa695fac516c428e8bff068173f.tar.bz2
Port enable_resource_whitelist_generation GYP->GN
BUG=551576 Review URL: https://codereview.chromium.org/1416683004 Cr-Commit-Position: refs/heads/master@{#358060}
Diffstat (limited to 'build/secondary')
-rw-r--r--build/secondary/tools/grit/grit_rule.gni25
1 files changed, 22 insertions, 3 deletions
diff --git a/build/secondary/tools/grit/grit_rule.gni b/build/secondary/tools/grit/grit_rule.gni
index a5cf81a..083e3d9 100644
--- a/build/secondary/tools/grit/grit_rule.gni
+++ b/build/secondary/tools/grit/grit_rule.gni
@@ -83,6 +83,11 @@ import("//build/config/crypto.gni")
import("//build/config/features.gni")
import("//build/config/ui.gni")
+declare_args() {
+ # Enables used resource whitelist generation.
+ enable_resource_whitelist_generation = false
+}
+
grit_defines = []
# Mac and iOS want Title Case strings.
@@ -335,10 +340,17 @@ template("grit") {
rebased_output_dir = rebase_path(output_dir, root_build_dir)
source_path = rebase_path(invoker.source, root_build_dir)
+ grit_flags = []
+ if (enable_resource_whitelist_generation) {
+ grit_flags += [ "-h" ]
+ if (is_win) {
+ grit_flags += [ "#define {textual_id} __pragma(message(\"whitelisted_resource_{numeric_id}\")) {numeric_id}" ]
+ } else {
+ grit_flags += [ "#define {textual_id} _Pragma(\"whitelisted_resource_{numeric_id}\") {numeric_id}" ]
+ }
+ }
if (defined(invoker.grit_flags)) {
- grit_flags = invoker.grit_flags
- } else {
- grit_flags = [] # These are optional so default to empty list.
+ grit_flags += invoker.grit_flags
}
assert_files_flags = []
@@ -371,6 +383,13 @@ template("grit") {
!invoker.use_qualified_include) {
include_dirs = [ output_dir ]
}
+
+ if ((is_linux || is_android) && enable_resource_whitelist_generation) {
+ cflags = [
+ "-Wunknown-pragmas",
+ "-Wno-error=unknown-pragmas",
+ ]
+ }
visibility = target_visibility
}