summaryrefslogtreecommitdiffstats
path: root/ash/ash.gyp
diff options
context:
space:
mode:
authordnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-14 21:08:56 +0000
committerdnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-14 21:08:56 +0000
commit29957af3773acac8b16aa37d33d4bde727a32a21 (patch)
tree6410e95393f295ca054423e944777dbc4a516e23 /ash/ash.gyp
parent112eb8dba36a81b7a979130a608ec51befd511b5 (diff)
downloadchromium_src-29957af3773acac8b16aa37d33d4bde727a32a21.zip
chromium_src-29957af3773acac8b16aa37d33d4bde727a32a21.tar.gz
chromium_src-29957af3773acac8b16aa37d33d4bde727a32a21.tar.bz2
Move chromeos/display/* to ui/display/chromeos
TBR=darin@chromium.org BUG=333413 Review URL: https://codereview.chromium.org/192483007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash.gyp')
-rw-r--r--ash/ash.gyp6
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 42cd552..88e5f69 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -681,7 +681,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/': [
@@ -1028,7 +1029,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',