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_common.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_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index eab4abc..02833d9 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -203,6 +203,7 @@ 'common_constants', 'common_net', 'default_plugin/default_plugin.gyp:default_plugin', + 'policy', 'theme_resources', '../app/app.gyp:app_base', '../app/app.gyp:app_resources', @@ -584,6 +585,7 @@ 'chrome_resources', 'chrome_strings', 'common_constants_win64', + 'policy_win64', '../app/app.gyp:app_base_nacl_win64', '../app/app.gyp:app_resources', '../base/base.gyp:base_nacl_win64', |