summaryrefslogtreecommitdiffstats
path: root/components/policy/BUILD.gn
diff options
context:
space:
mode:
authordgrogan <dgrogan@chromium.org>2015-03-09 16:47:56 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-09 23:48:36 +0000
commit27ee0fa9afe9cb97016e532bd0cecd1b011251b9 (patch)
treecf677cafa82c2c0ea67df4c435dac9ef0e2d9c2e /components/policy/BUILD.gn
parent466754fafc5e55e02090e56365d4cc3f8ecc01ea (diff)
downloadchromium_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/BUILD.gn')
-rw-r--r--components/policy/BUILD.gn20
1 files changed, 16 insertions, 4 deletions
diff --git a/components/policy/BUILD.gn b/components/policy/BUILD.gn
index e6a288e..61961e50 100644
--- a/components/policy/BUILD.gn
+++ b/components/policy/BUILD.gn
@@ -47,6 +47,9 @@ if (enable_configuration_policy) {
# 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 @@ if (enable_configuration_policy) {
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 @@ if (enable_configuration_policy) {
chrome_settings_proto_path,
cloud_policy_proto_path,
app_restrictions_path,
+ app_resources_path,
]
- if (target_os != "android") {
- outputs -= [ app_restrictions_path ]
+ if (current_os != "android") {
+ outputs -= [
+ app_restrictions_path,
+ app_resources_path,
+ ]
}
args = [
@@ -99,7 +109,9 @@ if (enable_configuration_policy) {
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),
]