chrome/chrome_common.gypi - Issue 6409040: New policy protobuf protocol.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_common.gypi

Issue 6409040: New policy protobuf protocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix build on mac and win; address comments 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:

Index: chrome/chrome_common.gypi

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi

index 390c610b3cba774778de764cef3811fb998e5815..dfb5a1340e2f23453aafafd485ed1cb64ab5c94a 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',

@@ -592,7 +592,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',

@@ -624,6 +624,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.