diff options
author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 13:24:32 +0000 |
---|---|---|
committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 13:24:32 +0000 |
commit | 98818cdcc329b8abf3a32d266cc984a0b06d0fe6 (patch) | |
tree | 13a59ecd0eb7bb71d4edb41f1133459fab9e6cf7 /chrome/chrome_exe.gypi | |
parent | a98ce12635e9c70626950f3bd9ae0e88ee5a357d (diff) | |
download | chromium_src-98818cdcc329b8abf3a32d266cc984a0b06d0fe6.zip chromium_src-98818cdcc329b8abf3a32d266cc984a0b06d0fe6.tar.gz chromium_src-98818cdcc329b8abf3a32d266cc984a0b06d0fe6.tar.bz2 |
Reland 72784
This is the first step to being able to re-constitute policy from a non-generic protobuf in a policy request in a fully automated way (i.e. the code for the process can be generated). The non-generic protobuf is required for automatic merging of policy on the server-side.
BUG=68309
TEST=existing policy/provider tests
Review URL: http://codereview.chromium.org/6357021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
-rw-r--r-- | chrome/chrome_exe.gypi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 1d9768c..319a078 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -443,6 +443,7 @@ 'dependencies': [ 'installer_util', 'installer_util_strings', + 'policy', '../breakpad/breakpad.gyp:breakpad_handler', '../breakpad/breakpad.gyp:breakpad_sender', '../sandbox/sandbox.gyp:sandbox', @@ -489,9 +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', 'installer_util_nacl_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', |