diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 14:50:24 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 14:50:24 +0000 |
| commit | 7745d7fe43b63dd0f550b552811d954c8422e5cb (patch) | |
| tree | 15083cb77f74ed519474a865d25c0f4ebdec1730 /components/policy.gypi | |
| parent | e6226384e05c58b53d7d95d00a6d757e39e7a51f (diff) | |
| download | chromium_src-7745d7fe43b63dd0f550b552811d954c8422e5cb.zip chromium_src-7745d7fe43b63dd0f550b552811d954c8422e5cb.tar.gz chromium_src-7745d7fe43b63dd0f550b552811d954c8422e5cb.tar.bz2 | |
Move the cloud policy protobufs into the component.
This change moved chrome/browser/policy/proto/chromeos to
chrome/browser/chromeos/policy/proto, and chrome/browser/policy/proto/cloud to
components/policy/proto.
This enables the component code to use the cloud policy protobufs, so that iOS
can use cloud policy.
The old location is still kept temporarily until new git mirrors are set up
pointing to the new locations. A couple of PRESUBMIT scripts check that the
files are kept in sync.
BUG=271392, 327345
TBR=mnissler@chromium.org
Review URL: https://codereview.chromium.org/108563005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240108 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/policy.gypi')
| -rw-r--r-- | components/policy.gypi | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/components/policy.gypi b/components/policy.gypi index fbaf5c1..af9db89 100644 --- a/components/policy.gypi +++ b/components/policy.gypi @@ -194,21 +194,30 @@ ], }, { - # Protobuf compiler / generator for cloud policy protocol buffers. - # TODO(joaodasilva): move these protobufs outside of chrome/, - # and update their output paths too. 'target_name': 'cloud_policy_proto', 'type': 'static_library', 'sources': [ - '../chrome/browser/policy/proto/cloud/chrome_extension_policy.proto', - '../chrome/browser/policy/proto/cloud/device_management_backend.proto', - '../chrome/browser/policy/proto/cloud/device_management_local.proto', + 'policy/proto/chrome_extension_policy.proto', + 'policy/proto/device_management_backend.proto', + 'policy/proto/device_management_local.proto', ], 'variables': { - 'proto_in_dir': '../chrome/browser/policy/proto/cloud', - 'proto_out_dir': 'chrome/browser/policy/proto/cloud', + 'proto_in_dir': 'policy/proto', + 'proto_out_dir': 'policy/proto', }, - 'includes': [ '../build/protoc.gypi' ] + 'includes': [ '../build/protoc.gypi' ], + 'conditions': [ + ['OS=="android"', { + 'sources!': [ + 'policy/proto/chrome_extension_policy.proto', + ], + }], + ['chromeos==0', { + 'sources!': [ + 'policy/proto/device_management_local.proto', + ], + }], + ], }, ], 'conditions': [ |