diff options
| author | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 14:37:00 +0000 |
|---|---|---|
| committer | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 14:37:00 +0000 |
| commit | 1e16fd462495798e68603560a2a44de2109d14a6 (patch) | |
| tree | 80db982880e6f4e4a746e2753e64ebbe7ed9cd3e /chrome/chrome_common.gypi | |
| parent | c574bcd52bd3ff2e8e9a8e2ff1505ee6bc328b73 (diff) | |
| download | chromium_src-1e16fd462495798e68603560a2a44de2109d14a6.zip chromium_src-1e16fd462495798e68603560a2a44de2109d14a6.tar.gz chromium_src-1e16fd462495798e68603560a2a44de2109d14a6.tar.bz2 | |
Revert 75106 - New policy protobuf protocol.
(Second attempt to land http://codereview.chromium.org/6409040/)
- cloud_policy.proto autogenerated from policy_templats.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/6523058
TBR=jkummerow@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 1ee077a..01e28c8 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', - 'app/policy/cloud_policy_codegen.gyp:policy_win64', + 'policy_win64', '../app/app.gyp:app_base_nacl_win64', '../app/app.gyp:app_resources', '../base/base.gyp:base_nacl_win64', @@ -625,7 +625,6 @@ ], '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. |