diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 13:49:20 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 13:49:20 +0000 |
| commit | 991573eea1ab5aeefb920ef46a055271713d694a (patch) | |
| tree | 2383d405f522d0441452d3befe9160e968a5f35e /chrome_frame | |
| parent | 7f123d2a3dc472dd796c13e2d7d599446fe9831d (diff) | |
| download | chromium_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_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 4 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame_launcher.gyp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index cd7d278..e3e7c71 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -104,8 +104,8 @@ 'type': 'executable', 'dependencies': [ '../base/base.gyp:test_support_base', - '../chrome/app/policy/cloud_policy_codegen.gyp:policy', '../chrome/chrome.gyp:test_support_common', + '../components/components.gyp:policy', '../net/net.gyp:net', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -667,9 +667,9 @@ 'target_name': 'chrome_frame_ie', 'type': 'static_library', 'dependencies': [ - '../chrome/app/policy/cloud_policy_codegen.gyp:policy', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:utility', + '../components/components.gyp:policy', '../content/content.gyp:content_common', '../net/net.gyp:net', '../third_party/libxml/libxml.gyp:libxml', diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp index bd41148..194b965 100644 --- a/chrome_frame/chrome_frame_launcher.gyp +++ b/chrome_frame/chrome_frame_launcher.gyp @@ -101,7 +101,7 @@ 'type': 'executable', 'dependencies': [ '../breakpad/breakpad.gyp:breakpad_handler', - '../chrome/app/policy/cloud_policy_codegen.gyp:policy', + '../components/components.gyp:policy', '../google_update/google_update.gyp:google_update', 'chrome_frame.gyp:chrome_frame_utils', 'chrome_frame_launcher_version_resources', |