summaryrefslogtreecommitdiffstats
path: root/net/net.gyp
diff options
context:
space:
mode:
authorjkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 09:36:09 +0000
committerjkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 09:36:09 +0000
commit43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd (patch)
tree3ecf01593abb3493a44ca269ca521d562431be42 /net/net.gyp
parentbe24d307cfb3aba57e4456063eb31207665ce657 (diff)
downloadchromium_src-43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd.zip
chromium_src-43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd.tar.gz
chromium_src-43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd.tar.bz2
New policy protobuf protocol.
- cloud_policy.proto autogenerated from policy_templates.json - C++ method decoding the protobuf autogenerated from policy_templates.json - changed policy fetching mechanism to fetch new-style policy protobufs BUG=68309, chromium-os:11253, chromium-os:11255 TEST=CloudPolicyCacheTest.*; also manual test against python testserver Review URL: http://codereview.chromium.org/6409040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
-rw-r--r--net/net.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/net.gyp b/net/net.gyp
index 9035094..5266f74a 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1182,8 +1182,8 @@
'conditions': [
['inside_chromium_build==1', {
'dependencies': [
+ '../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_compile',
'../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto',
- '../chrome/browser/policy/proto/device_management_proto.gyp:device_management_proto',
'../third_party/protobuf/protobuf.gyp:py_proto',
],
}],