Chromium Code Reviews| Index: components/policy.gypi |
| diff --git a/components/policy.gypi b/components/policy.gypi |
| index 7e0533a4e795378636eb32fa46649c3ae5d8809c..b05eea73a581e1379297ffd123663f485347bc3f 100644 |
| --- a/components/policy.gypi |
| +++ b/components/policy.gypi |
| @@ -12,7 +12,6 @@ |
| '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': |
| @@ -22,9 +21,7 @@ |
| 'protobuf_decoder_path': |
| '<(policy_out_dir)/policy/cloud_policy_generated.cc', |
| 'app_restrictions_path': |
| - '<(android_resources_out_dir)/xml-v21/app_restrictions.xml', |
| - 'app_resources_path': |
| - '<(android_resources_out_dir)/values-v21/restriction_values.xml', |
| + '<(policy_out_dir)/app_restrictions.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': |
| @@ -115,7 +112,6 @@ |
| '<(chrome_settings_proto_path)', |
| '<(cloud_policy_proto_path)', |
| '<(app_restrictions_path)', |
| - '<(app_resources_path)', |
| ], |
| 'action_name': 'generate_policy_source', |
| 'action': [ |
| @@ -127,7 +123,6 @@ |
| '--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', |
| @@ -137,7 +132,6 @@ |
| ['OS!="android"', { |
| 'outputs!': [ |
| '<(app_restrictions_path)', |
| - '<(app_resources_path)', |
| ], |
| }], |
| ], |
| @@ -360,7 +354,7 @@ |
| }, |
| ], |
| }], |
| - ['OS=="win" or OS=="mac" or OS=="linux"', { |
| + ['OS!="ios" and chromeos==0', { |
|
bartfab (slow)
2015/01/26 09:57:59
Why do you exclude policy_templates on Chrome OS?
knn
2015/01/27 11:27:13
As Bernhard pointed out to me, Chrome OS uses Clou
Bernhard Bauer
2015/01/27 12:05:43
Really, the target should probably be called local
bartfab (slow)
2015/01/27 12:10:00
I am actually not sure what exactly this target ge
knn
2015/01/27 12:18:36
Yeah we could rename this generate_localized_polic
Bernhard Bauer
2015/01/27 12:19:59
The protos are generated by the cloud_policy_code_
|
| 'targets': [ |
| { |
| # policy_templates has different inputs and outputs, so it can't use |