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-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 /chrome/chrome_common.gypi
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 '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.