diff options
author | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 09:52:42 +0000 |
---|---|---|
committer | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 09:52:42 +0000 |
commit | 23ce43c353afdfe50571bfb57ceb384216170b84 (patch) | |
tree | 962acf3b1d63453648eda6e021ff124477107d66 /chrome/chrome_exe.gypi | |
parent | 43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd (diff) | |
download | chromium_src-23ce43c353afdfe50571bfb57ceb384216170b84.zip chromium_src-23ce43c353afdfe50571bfb57ceb384216170b84.tar.gz chromium_src-23ce43c353afdfe50571bfb57ceb384216170b84.tar.bz2 |
Revert 75082 - 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
TBR=jkummerow@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
-rw-r--r-- | chrome/chrome_exe.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index bf6fcf4..90c53f5 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -443,11 +443,11 @@ 'dependencies': [ 'installer_util', 'installer_util_strings', + 'policy', '../breakpad/breakpad.gyp:breakpad_handler', '../breakpad/breakpad.gyp:breakpad_sender', '../sandbox/sandbox.gyp:sandbox', 'app/locales/locales.gyp:*', - 'app/policy/cloud_policy_codegen.gyp:policy', ], 'msvs_settings': { 'VCLinkerTool': { @@ -490,10 +490,10 @@ # On Windows make sure we've built Win64 version of chrome_dll, # which contains all of the library code with Chromium # functionality. - 'chrome_dll_nacl_win64', - 'common_constants_win64', 'installer_util_nacl_win64', - 'app/policy/cloud_policy_codegen.gyp:policy_win64', + 'common_constants_win64', + 'chrome_dll_nacl_win64', + 'policy_win64', '../breakpad/breakpad.gyp:breakpad_handler_win64', '../breakpad/breakpad.gyp:breakpad_sender_win64', '../base/base.gyp:base_nacl_win64', |