summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_common.gypi
diff options
context:
space:
mode:
authorjkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-17 13:25:23 +0000
committerjkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-17 13:25:23 +0000
commitf8636972b3e1d3a9bbf7f86b6708c0f5d66571ae (patch)
tree1cc358fe9fc57efd09b612b261d484ad359bf1fe /chrome/chrome_common.gypi
parentd20e0b986707dd49ae7a2cad347f4e50140ec86e (diff)
downloadchromium_src-f8636972b3e1d3a9bbf7f86b6708c0f5d66571ae.zip
chromium_src-f8636972b3e1d3a9bbf7f86b6708c0f5d66571ae.tar.gz
chromium_src-f8636972b3e1d3a9bbf7f86b6708c0f5d66571ae.tar.bz2
New policy protobuf protocol.
(Third attempt to land http://codereview.chromium.org/6409040/ -- now without memory leaks) - cloud_policy.proto autogenerated from policy_templates.json - C++ method decoding the protobuf also 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/6532019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
-rw-r--r--chrome/chrome_common.gypi5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 01e28c8..1ee077a 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -202,12 +202,12 @@
# TODO(gregoryd): chrome_resources and chrome_strings could be
# shared with the 64-bit target, but it does not work due to a gyp
# issue.
+ 'app/policy/cloud_policy_codegen.gyp:policy',
'chrome_resources',
'chrome_strings',
'common_constants',
'common_net',
'default_plugin/default_plugin.gyp:default_plugin',
- 'policy',
'theme_resources',
'../app/app.gyp:app_base',
'../app/app.gyp:app_resources',
@@ -593,7 +593,7 @@
'chrome_resources',
'chrome_strings',
'common_constants_win64',
- 'policy_win64',
+ 'app/policy/cloud_policy_codegen.gyp:policy_win64',
'../app/app.gyp:app_base_nacl_win64',
'../app/app.gyp:app_resources',
'../base/base.gyp:base_nacl_win64',
@@ -625,6 +625,7 @@
],
'export_dependent_settings': [
'../app/app.gyp:app_base_nacl_win64',
+ 'app/policy/cloud_policy_codegen.gyp:policy_win64',
],
# TODO(gregoryd): This could be shared with the 32-bit target, but
# it does not work due to a gyp issue.