chrome/chrome_browser.gypi - Issue 7096013: Allow device policy code to be optionally included.

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_browser.gypi

Issue 7096013: Allow device policy code to be optionally included. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Make changes requested by mnissler. Created 9 years, 7 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_browser.gypi

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

index abbc724e2e20e1a4b4cfc6daeda3172b0ebb336e..cdf687784dd711ae783c2d26eb452b33f3c02559 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -1614,6 +1614,7 @@

'<(protoc_out_dir)/chrome/browser/policy/proto/chrome_device_policy.pb.h',

'<(protoc_out_dir)/chrome/browser/policy/proto/device_management_backend.pb.cc',

'<(protoc_out_dir)/chrome/browser/policy/proto/device_management_backend.pb.h',

+ 'browser/policy/policy_stubs.cc',

'browser/policy/proto/device_management_constants.cc',

'browser/policy/proto/device_management_constants.h',

'<(protoc_out_dir)/chrome/browser/policy/proto/device_management_local.pb.cc',

@@ -3455,6 +3456,7 @@

'browser/ui/webui/options/language_options_handler_common.h',

'browser/ui/webui/options/options_managed_banner_handler.cc',

'browser/ui/webui/options/options_managed_banner_handler.h',

+ 'browser/ui/webui/options/options_managed_banner_handler_stub.cc',

'browser/ui/webui/options/options_ui.cc',

'browser/ui/webui/options/options_ui.h',

'browser/ui/webui/options/password_manager_handler.cc',

@@ -3563,6 +3565,19 @@

'DEBUG_DEVTOOLS=1',

}],

+ ['configuration_policy==1', {

+ 'sources!': [

+ 'browser/policy/policy_stubs.cc',

+ 'browser/ui/webui/options/options_managed_banner_handler_stub.cc',

+ ],

+ }, {

+ 'sources/': [

+ ['exclude', '^browser/policy/'],

+ ['exclude', '^browser/ui/webui/options/options_managed_banner_handler.cc'],

+ ['include', '^browser/policy/policy_stubs.cc'],

+ ['include', '^browser/ui/webui/options/options_managed_banner_handler_stub.cc'],

Torne 2011/06/01 10:45:36 This line shouldn't be needed, it's already includ

John Knottenbelt 2011/06/01 13:13:02 Done.

+ ],

+ }],

['chromeos==0', {

'sources/': [

['exclude', '^browser/chromeos'],

« build/common.gypi ('K') | « chrome/browser/ui/webui/options/personal_options_handler.cc ('k') | chrome/chrome_tests.gypi » ('j') | chrome/chrome_tests.gypi » ('J')