ash/ash.gyp - Issue 192483007: Move chromeos/display/* to ui/display/chromeos

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: ash/ash.gyp

Issue 192483007: Move chromeos/display/* to ui/display/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Include display.gyp into ChromeOS builds only Created 6 years, 9 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: ash/ash.gyp

diff --git a/ash/ash.gyp b/ash/ash.gyp

index 3bb2b5ebbdba02042a14ffe767159b8607e4b33f..da437d020cc014a805cf2c7dc9f9cc655829d436 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -674,7 +674,8 @@

'../chromeos/chromeos.gyp:chromeos',

# Ash #includes power_supply_properties.pb.h directly.

'../chromeos/chromeos.gyp:power_manager_proto',

- '../device/bluetooth/bluetooth.gyp:device_bluetooth',

+ '../device/bluetooth/bluetooth.gyp:device_bluetooth',

+ '../ui/display/display.gyp:display',

}, { # else: chromeos!=1

'sources/': [

@@ -1019,7 +1020,8 @@

['chromeos==1', {

'dependencies': [

'../chromeos/chromeos.gyp:power_manager_proto',

- '../device/bluetooth/bluetooth.gyp:device_bluetooth',

+ '../device/bluetooth/bluetooth.gyp:device_bluetooth',

+ '../ui/display/display.gyp:display',

'sources': [

'first_run/first_run_helper_unittest.cc',

« no previous file with comments | « no previous file | ash/display/display_change_observer_chromeos.h » ('j') | no next file with comments »