Add i18n support for Android App Restrictions.

components/policy.gypi

Index: components/policy.gypi
diff --git a/components/policy.gypi b/components/policy.gypi
index 7e0533a4e795378636eb32fa46649c3ae5d8809c..9c9fe06f2e08b78916d58f07d8c4f50731cf15af 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':
@@ -35,6 +32,33 @@
     'cloud_policy_proto_path':
         '<(policy_out_dir)/policy/cloud_policy.proto',
   },
+  'targets': [
+    {
+      # policy_templates has different inputs and outputs, so it can't use
+      # the rules of chrome_strings
+      'target_name': 'policy_templates',
+      'type': 'none',
+      'variables': {
+        'grit_grd_file': 'policy/resources/policy_templates.grd',
+        'grit_info_cmd': [
+          'python',
+          '<(DEPTH)/tools/grit/grit_info.py',
+          '<@(grit_defines)',
+        ],
+      },
+      'includes': [
+        '../build/grit_target.gypi',
+      ],
+      'actions': [
+        {
+          'action_name': 'policy_templates',
+          'includes': [
+            '../build/grit_action.gypi',
+          ],
+        },
+      ],
+    },
+  ],
   'conditions': [
     ['component=="static_library"', {
       'targets': [
@@ -115,7 +139,6 @@
                 '<(chrome_settings_proto_path)',
                 '<(cloud_policy_proto_path)',
                 '<(app_restrictions_path)',
-                '<(app_resources_path)',
               ],
               'action_name': 'generate_policy_source',
               'action': [
@@ -127,7 +150,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 +159,6 @@
                 ['OS!="android"', {
                   'outputs!': [
                     '<(app_restrictions_path)',
-                    '<(app_resources_path)',
                   ],
                 }],
               ],
@@ -360,35 +381,6 @@
         },
       ],
     }],
-    ['OS=="win" or OS=="mac" or OS=="linux"', {

[Bernhard Bauer, 2015/01/21 14:23:48]

Shouldn't this stay here and just get extended by OS=='android'? There are still
other OS's where we don't need this target (Chrome OS, iOS).

[knn, 2015/01/21 14:42:18]

Sorry, forgot about iOS. isn't ChromeOs still under OS=linux but with the
chromeos flag?

[Bernhard Bauer, 2015/01/21 15:43:27]

That's true. We probably don't need the templates for Chrome OS though, because
that only supports cloud policy.

[knn, 2015/01/21 16:39:31]

Done.

-      'targets': [
-        {
-          # policy_templates has different inputs and outputs, so it can't use
-          # the rules of chrome_strings
-          'target_name': 'policy_templates',
-          'type': 'none',
-          'variables': {
-            'grit_grd_file': 'policy/resources/policy_templates.grd',
-            'grit_info_cmd': [
-              'python',
-              '<(DEPTH)/tools/grit/grit_info.py',
-              '<@(grit_defines)',
-            ],
-          },
-          'includes': [
-            '../build/grit_target.gypi',
-          ],
-          'actions': [
-            {
-              'action_name': 'policy_templates',
-              'includes': [
-                '../build/grit_action.gypi',
-              ],
-            },
-          ],
-        },
-      ],
-    }],
     ['OS=="mac"', {
       'targets': [
         {