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

Unified Diff: tools/grit/repack.gni

Issue 2175413004: Enable whitelist generation for all builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed agrieve's comments and removed stderr filtering. Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: tools/grit/repack.gni
diff --git a/tools/grit/repack.gni b/tools/grit/repack.gni
index 7dd1520a56263f656b75b12948cb713c09da039b..7143375a5ff69a2a9c8e19837182a27f61413106 100644
--- a/tools/grit/repack.gni
+++ b/tools/grit/repack.gni
@@ -2,11 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-declare_args() {
- # Absolute path to a resource whitelist (generated using
- # //tools/resources/find_used_resources.py).
- repack_whitelist = ""
-}
+import("//tools/grit/grit_rule.gni")
# This file defines a template to invoke grit repack in a consistent manner.
#
@@ -41,11 +37,13 @@ template("repack") {
]
args = []
- if (repack_whitelist != "") {
- assert(
- repack_whitelist == rebase_path(repack_whitelist),
- "repack_whitelist must be an absolute path. Current value is $repack_whitelist")
- args += [ "--whitelist=$repack_whitelist" ]
+ if (enable_resource_whitelist_generation) {
+ args += [ "--suppress-removed-key-output" ]
agrieve 2016/07/29 01:55:21 nit: the print will never happen unless repack_whi
estevenson 2016/07/29 15:33:57 Done.
+ }
+ if (defined(invoker.repack_whitelist)) {
+ inputs += [ invoker.repack_whitelist ]
+ _rebased_whitelist = rebase_path(invoker.repack_whitelist)
+ args += [ "--whitelist=$_rebased_whitelist" ]
}
args += [ rebase_path(invoker.output, root_build_dir) ]
args += rebase_path(invoker.sources, root_build_dir)

Powered by Google App Engine
This is Rietveld 408576698