summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_dll.gypi
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-16 13:49:20 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-16 13:49:20 +0000
commit991573eea1ab5aeefb920ef46a055271713d694a (patch)
tree2383d405f522d0441452d3befe9160e968a5f35e /chrome/chrome_dll.gypi
parent7f123d2a3dc472dd796c13e2d7d599446fe9831d (diff)
downloadchromium_src-991573eea1ab5aeefb920ef46a055271713d694a.zip
chromium_src-991573eea1ab5aeefb920ef46a055271713d694a.tar.gz
chromium_src-991573eea1ab5aeefb920ef46a055271713d694a.tar.bz2
Move chrome/app/policy into components/policy.
This move enables using the files derived from policy_templates.json in iOS builds. List of changes: - cloud_policy_codegen.gyp and policy_templates.gypi have been merged into components/policy.gypi - policy_templates.json moved into components/policy/resources/ - policy_templates.grd and *.xtb files moved into components/policy/resources/ - syntax_check_policy_templates_json.py and chrome/tools/build/generate_policy_source.py moved into components/policy/tools BUG=271392 R=jochen@chromium.org, pastarmovj@chromium.org Review URL: https://codereview.chromium.org/108513011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
-rw-r--r--chrome/chrome_dll.gypi4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 84a22fd..9d8cc05 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -80,8 +80,8 @@
},
'dependencies': [
'<@(chromium_browser_dependencies)',
+ '../components/components.gyp:policy',
'../content/content.gyp:content_app_browser',
- 'app/policy/cloud_policy_codegen.gyp:policy',
],
'conditions': [
['use_aura==1', {
@@ -289,7 +289,7 @@
'dependencies': [
'../breakpad/breakpad.gyp:breakpad',
'../components/components.gyp:breakpad_component',
- 'app/policy/cloud_policy_codegen.gyp:policy',
+ '../components/components.gyp:policy',
],
'sources': [
'app/chrome_breakpad_client.cc',