| Index: components/policy/BUILD.gn
|
| diff --git a/components/policy/BUILD.gn b/components/policy/BUILD.gn
|
| index 5c5d7d6f3d1b7ba9340683a1f921de769811630d..c8266dea07a3f8582ad32ff99ac22f2b8ca198a4 100644
|
| --- a/components/policy/BUILD.gn
|
| +++ b/components/policy/BUILD.gn
|
| @@ -47,6 +47,9 @@
|
| # build puts everything into the following directory. We do the same for now.
|
| policy_gen_dir = "$root_gen_dir/policy"
|
|
|
| + # Directory for generating Android App Restrictions resources
|
| + android_resources_gen_dir = "$policy_gen_dir/android_resources"
|
| +
|
| # This protobuf is equivalent to chrome_settings.proto but shares messages
|
| # for policies of the same type, so that less classes have to be generated
|
| # and compiled.
|
| @@ -59,7 +62,10 @@
|
| constants_header_path = "$policy_gen_dir/policy_constants.h"
|
| constants_source_path = "$policy_gen_dir/policy_constants.cc"
|
| protobuf_decoder_path = "$policy_gen_dir/cloud_policy_generated.cc"
|
| - app_restrictions_path = "$policy_gen_dir/app_restrictions.xml"
|
| + app_restrictions_path =
|
| + "$android_resources_gen_dir/xml-v21/app_restrictions.xml"
|
| + app_resources_path =
|
| + "$android_resources_gen_dir/values-v21/restriction_values.xml"
|
|
|
| action("cloud_policy_code_generate") {
|
| script = "tools/generate_policy_source.py"
|
| @@ -80,10 +86,14 @@
|
| chrome_settings_proto_path,
|
| cloud_policy_proto_path,
|
| app_restrictions_path,
|
| - ]
|
| -
|
| - if (target_os != "android") {
|
| - outputs -= [ app_restrictions_path ]
|
| + app_resources_path,
|
| + ]
|
| +
|
| + if (current_os != "android") {
|
| + outputs -= [
|
| + app_restrictions_path,
|
| + app_resources_path,
|
| + ]
|
| }
|
|
|
| args = [
|
| @@ -99,7 +109,9 @@
|
| rebase_path(protobuf_decoder_path, root_build_dir),
|
| "--app-restrictions-definition=" +
|
| rebase_path(app_restrictions_path, root_build_dir),
|
| - target_os,
|
| + "--app-restrictions-resources=" +
|
| + rebase_path(app_resources_path, root_build_dir),
|
| + current_os,
|
| chromeos_flag,
|
| rebase_path("resources/policy_templates.json", root_build_dir),
|
| ]
|
|
|