Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3980)

Unified Diff: chrome/chrome_common.gypi

Issue 6532019: New policy protobuf protocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix one more leak Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 01e28c85ee3b6c1b2c9ebb3e16c3f0b88633420a..1ee077a7d444806a2b52145836ede781e6cf3558 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.

Powered by Google App Engine
This is Rietveld 408576698