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

Unified Diff: components/policy/BUILD.gn

Issue 929353002: Fix generate_policy_source.py to honour supported_on ranges. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add some error handling for malformatted supported_on version ranges. Created 5 years, 10 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
« no previous file with comments | « components/policy.gypi ('k') | components/policy/tools/generate_policy_source.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/policy/BUILD.gn
diff --git a/components/policy/BUILD.gn b/components/policy/BUILD.gn
index 632cbe673d6991128a72d59849ed5ecfff43f5bf..0eea25c8fa928e9b80b5e9e4ee6d3b9ff2ad8a84 100644
--- a/components/policy/BUILD.gn
+++ b/components/policy/BUILD.gn
@@ -67,6 +67,19 @@ if (enable_configuration_policy) {
app_resources_path =
"$android_resources_gen_dir/values-v21/restriction_values.xml"
+ # Obtain Chromium version.
+ version_py_abspath = "//build/util/version.py"
+ chrome_version_abspath = "//chrome/VERSION"
+ chrome_version_path = rebase_path(chrome_version_abspath, root_build_dir)
+ version_full = exec_script(version_py_abspath,
+ [
+ "-f",
+ chrome_version_path,
+ "-t @MAJOR@.@MINOR@.@BUILD@.@PATCH@",
+ ],
+ "trim string",
+ [ chrome_version_abspath ])
Mattias Nissler (ping if slow) 2015/02/18 10:34:42 I have no idea where this came from, but I assume
Thiemo Nagel 2015/02/18 17:31:56 Done.
brettw 2015/02/23 19:19:07 I have tried very hard not to add this kind of thi
Thiemo Nagel 2015/04/22 17:26:47 Done.
+
action("cloud_policy_code_generate") {
script = "tools/generate_policy_source.py"
@@ -111,6 +124,7 @@ if (enable_configuration_policy) {
rebase_path(app_restrictions_path, root_build_dir),
"--app-restrictions-resources=" +
rebase_path(app_resources_path, root_build_dir),
+ version_full,
os,
chromeos_flag,
rebase_path("resources/policy_templates.json", root_build_dir),
« no previous file with comments | « components/policy.gypi ('k') | components/policy/tools/generate_policy_source.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698