diff options
| author | dgrogan <dgrogan@chromium.org> | 2015-03-09 16:47:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-09 23:48:36 +0000 |
| commit | 27ee0fa9afe9cb97016e532bd0cecd1b011251b9 (patch) | |
| tree | cf677cafa82c2c0ea67df4c435dac9ef0e2d9c2e /components/policy.gypi | |
| parent | 466754fafc5e55e02090e56365d4cc3f8ecc01ea (diff) | |
| download | chromium_src-27ee0fa9afe9cb97016e532bd0cecd1b011251b9.zip chromium_src-27ee0fa9afe9cb97016e532bd0cecd1b011251b9.tar.gz chromium_src-27ee0fa9afe9cb97016e532bd0cecd1b011251b9.tar.bz2 | |
Revert of Add i18n support for Android App Restrictions. (patchset #7 id:120001 of https://codereview.chromium.org/865573002/)
Reason for revert:
Broke some GN builds, e.g.:
http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/24483/steps/compile/logs/stdio
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20GN/builds/11092/steps/compile/logs/stdio
ninja: Entering directory `/mnt/data/b/build/slave/Linux_GN/build/src/out/Release'
ninja:error: expected depfile 'gen/chrome/policy_templates.d' to mention 'gen/chrome/app/policy/common/html/am/chrome_policy_list.html', got 'gen/chrome/app/policy/linux/examples/chrome.json'
Original issue's description:
> Add i18n support for Android App Restrictions.
>
> GYP target policy_templates is now enabled for android as well.
> Remove code that generated Policy resources w/o translation for Android.
>
> roll grit 186:187
>
> 187: Add a Policy template writer that generates Android resources which can be exposed through Android's App Restriction Schema.
>
> Depends on:
> https://codereview.chromium.org/865563002
>
> BUG=450548
>
> Committed: https://crrev.com/cd9f7d3afef0d0d4054318e9999aee879eaf26e1
> Cr-Commit-Position: refs/heads/master@{#319758}
TBR=bauerb@chromium.org,bartfab@chromium.org,knn@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=450548
Review URL: https://codereview.chromium.org/992853002
Cr-Commit-Position: refs/heads/master@{#319773}
Diffstat (limited to 'components/policy.gypi')
| -rw-r--r-- | components/policy.gypi | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/components/policy.gypi b/components/policy.gypi index 189c01e..e6573b6 100644 --- a/components/policy.gypi +++ b/components/policy.gypi @@ -12,6 +12,7 @@ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 'policy_out_dir': '<(SHARED_INTERMEDIATE_DIR)/policy', 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', + 'android_resources_out_dir': '<(policy_out_dir)/android_resources', 'generate_policy_source_script_path': 'policy/tools/generate_policy_source.py', 'policy_constant_header_path': @@ -21,7 +22,9 @@ 'protobuf_decoder_path': '<(policy_out_dir)/policy/cloud_policy_generated.cc', 'app_restrictions_path': - '<(policy_out_dir)/app_restrictions.xml', + '<(android_resources_out_dir)/xml-v21/app_restrictions.xml', + 'app_resources_path': + '<(android_resources_out_dir)/values-v21/restriction_values.xml', # 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': @@ -112,6 +115,7 @@ '<(chrome_settings_proto_path)', '<(cloud_policy_proto_path)', '<(app_restrictions_path)', + '<(app_resources_path)', ], 'action_name': 'generate_policy_source', 'action': [ @@ -123,6 +127,7 @@ '--cloud-policy-protobuf=<(cloud_policy_proto_path)', '--cloud-policy-decoder=<(protobuf_decoder_path)', '--app-restrictions-definition=<(app_restrictions_path)', + '--app-restrictions-resources=<(app_resources_path)', '<(OS)', '<(chromeos)', 'policy/resources/policy_templates.json', @@ -132,6 +137,7 @@ ['OS!="android"', { 'outputs!': [ '<(app_restrictions_path)', + '<(app_resources_path)', ], }], ], @@ -364,7 +370,7 @@ }, ], }], - ['OS!="ios"', { + ['OS=="win" or OS=="mac" or OS=="linux"', { 'targets': [ { # policy_templates has different inputs and outputs, so it can't use |