diff options
| author | fhorschig <fhorschig@chromium.org> | 2015-10-12 03:38:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-12 10:39:02 +0000 |
| commit | 2039583c673a001cdda5f32b7f9ffccb143ff1df (patch) | |
| tree | 484fe992ba0a37b101f0915b6cb4673023a29071 /components/policy.gypi | |
| parent | c853a6235f7a668f14248d59ce04b271e4e0c111 (diff) | |
| download | chromium_src-2039583c673a001cdda5f32b7f9ffccb143ff1df.zip chromium_src-2039583c673a001cdda5f32b7f9ffccb143ff1df.tar.gz chromium_src-2039583c673a001cdda5f32b7f9ffccb143ff1df.tar.bz2 | |
Add tags to policy_templates.json and parse them.
In order to store, load and display tags for policies; policies need
to be annotated with tags that get generated into the policy
constants.
To minimize the required storage, a new header is generated that
introduces an enum to not store multiple strings. This header also
provides a constant denoting the maximum number of tags to make it
flexible while minimizing the number of stored "NO_TAG" tags.
BUG=134849
TBR=atwilson@chromium.org
patch from issue 1321713004 at patchset 20001 (http://crrev.com/1321713004#ps20001)
Review URL: https://codereview.chromium.org/1370673002
Cr-Commit-Position: refs/heads/master@{#353506}
Diffstat (limited to 'components/policy.gypi')
| -rw-r--r-- | components/policy.gypi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/components/policy.gypi b/components/policy.gypi index d032ace..7788538 100644 --- a/components/policy.gypi +++ b/components/policy.gypi @@ -22,6 +22,8 @@ '<(policy_out_dir)/policy/cloud_policy_generated.cc', 'app_restrictions_path': '<(policy_out_dir)/app_restrictions.xml', + 'risk_tag_header_path': + '<(policy_out_dir)/risk_tag.h', # This is the "full" protobuf, which defines one protobuf message per # policy. It is also the format currently used by the server. 'chrome_settings_proto_path': @@ -123,6 +125,7 @@ '<(chrome_settings_proto_path)', '<(cloud_policy_proto_path)', '<(app_restrictions_path)', + '<(risk_tag_header_path)', ], 'action_name': 'generate_policy_source', 'action': [ @@ -134,6 +137,7 @@ '--cloud-policy-protobuf=<(cloud_policy_proto_path)', '--cloud-policy-decoder=<(protobuf_decoder_path)', '--app-restrictions-definition=<(app_restrictions_path)', + '--risk-tag-header=<(risk_tag_header_path)', '<(DEPTH)/chrome/VERSION', '<(OS)', '<(chromeos)', @@ -215,6 +219,7 @@ 'sources': [ '<(policy_constant_header_path)', '<(policy_constant_source_path)', + '<(risk_tag_header_path)', '<(protobuf_decoder_path)', ], 'include_dirs': [ @@ -355,7 +360,7 @@ { 'target_name' : 'policy_jni_headers', 'type': 'none', - 'sources': [ + 'sources': [ 'policy/android/java/src/org/chromium/policy/CombinedPolicyProvider.java', 'policy/android/java/src/org/chromium/policy/PolicyConverter.java', ], @@ -433,6 +438,7 @@ 'sources': [ '<(policy_constant_header_path)', '<(policy_constant_source_path)', + '<(risk_tag_header_path)', ], 'include_dirs': [ '<(DEPTH)', |