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

Side by Side Diff: ui/aura_shell/aura_shell.gyp

Issue 8430011: Revert 107967 - Introduces chromium_resources.gyp to factor out Chrome resource generation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 9
10 'targets': [ 10 'targets': [
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 'workspace/workspace_manager.cc', 73 'workspace/workspace_manager.cc',
74 'workspace/workspace_manager.h', 74 'workspace/workspace_manager.h',
75 ], 75 ],
76 }, 76 },
77 { 77 {
78 'target_name': 'aura_shell_unittests', 78 'target_name': 'aura_shell_unittests',
79 'type': 'executable', 79 'type': 'executable',
80 'dependencies': [ 80 'dependencies': [
81 '../../base/base.gyp:base', 81 '../../base/base.gyp:base',
82 '../../base/base.gyp:test_support_base', 82 '../../base/base.gyp:test_support_base',
83 '../../chrome/chrome_resources.gyp:packed_resources',
84 '../../build/temp_gyp/googleurl.gyp:googleurl', 83 '../../build/temp_gyp/googleurl.gyp:googleurl',
85 '../../skia/skia.gyp:skia', 84 '../../skia/skia.gyp:skia',
86 '../../testing/gtest.gyp:gtest', 85 '../../testing/gtest.gyp:gtest',
87 '../../third_party/icu/icu.gyp:icui18n', 86 '../../third_party/icu/icu.gyp:icui18n',
88 '../../third_party/icu/icu.gyp:icuuc', 87 '../../third_party/icu/icu.gyp:icuuc',
89 '../../views/views.gyp:views', 88 '../../views/views.gyp:views',
90 '../gfx/compositor/compositor.gyp:compositor_test_support', 89 '../gfx/compositor/compositor.gyp:compositor_test_support',
91 '../gfx/compositor/compositor.gyp:test_compositor', 90 '../gfx/compositor/compositor.gyp:test_compositor',
92 '../ui.gyp:gfx_resources', 91 '../ui.gyp:gfx_resources',
93 '../ui.gyp:ui', 92 '../ui.gyp:ui',
(...skipping 10 matching lines...) Expand all
104 'launcher/view_model_utils_unittest.cc', 103 'launcher/view_model_utils_unittest.cc',
105 'workspace/workspace_manager_unittest.cc', 104 'workspace/workspace_manager_unittest.cc',
106 'run_all_unittests.cc', 105 'run_all_unittests.cc',
107 'test_suite.cc', 106 'test_suite.cc',
108 'test_suite.h', 107 'test_suite.h',
109 108
110 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 109 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
111 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 110 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
112 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 111 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
113 ], 112 ],
113 'conditions': [
114 ['OS!="mac"', {
115 'dependencies': [
116 '../../chrome/chrome.gyp:packed_resources',
117 ],
118 }],
119 ],
114 }, 120 },
115 { 121 {
116 'target_name': 'aura_shell_exe', 122 'target_name': 'aura_shell_exe',
117 'type': 'executable', 123 'type': 'executable',
118 'dependencies': [ 124 'dependencies': [
119 '../../base/base.gyp:base', 125 '../../base/base.gyp:base',
120 '../../base/base.gyp:base_i18n', 126 '../../base/base.gyp:base_i18n',
121 '../../chrome/chrome_resources.gyp:packed_resources',
122 '../../skia/skia.gyp:skia', 127 '../../skia/skia.gyp:skia',
123 '../../third_party/icu/icu.gyp:icui18n', 128 '../../third_party/icu/icu.gyp:icui18n',
124 '../../third_party/icu/icu.gyp:icuuc', 129 '../../third_party/icu/icu.gyp:icuuc',
125 '../../views/views.gyp:views', 130 '../../views/views.gyp:views',
126 '../aura/aura.gyp:aura', 131 '../aura/aura.gyp:aura',
127 '../gfx/compositor/compositor.gyp:compositor', 132 '../gfx/compositor/compositor.gyp:compositor',
128 '../gfx/compositor/compositor.gyp:compositor_test_support', 133 '../gfx/compositor/compositor.gyp:compositor_test_support',
129 '../ui.gyp:gfx_resources', 134 '../ui.gyp:gfx_resources',
130 '../ui.gyp:ui', 135 '../ui.gyp:ui',
131 '../ui.gyp:ui_resources', 136 '../ui.gyp:ui_resources',
132 '../ui.gyp:ui_resources_standard', 137 '../ui.gyp:ui_resources_standard',
133 'aura_shell', 138 'aura_shell',
134 ], 139 ],
135 'sources': [ 140 'sources': [
136 'examples/aura_shell_main.cc', 141 'examples/aura_shell_main.cc',
137 'examples/bubble.cc', 142 'examples/bubble.cc',
138 'examples/example_factory.h', 143 'examples/example_factory.h',
139 'examples/lock_view.cc', 144 'examples/lock_view.cc',
140 'examples/toplevel_window.cc', 145 'examples/toplevel_window.cc',
141 'examples/toplevel_window.h', 146 'examples/toplevel_window.h',
142 'examples/widgets.cc', 147 'examples/widgets.cc',
143 'examples/window_type_launcher.cc', 148 'examples/window_type_launcher.cc',
144 'examples/window_type_launcher.h', 149 'examples/window_type_launcher.h',
145 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 150 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
146 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 151 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
147 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 152 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
148 ], 153 ],
154 'conditions': [
155 ['OS!="mac"', {
156 'dependencies': [
157 '../../chrome/chrome.gyp:packed_resources',
158 ],
159 }],
160 ],
149 }, 161 },
150 # It's convenient for aura_shell developers to be able to build all 162 # It's convenient for aura_shell developers to be able to build all
151 # compositor and aura targets from within this solution. 163 # compositor and aura targets from within this solution.
152 { 164 {
153 'target_name': 'buildbot_targets', 165 'target_name': 'buildbot_targets',
154 'type': 'none', 166 'type': 'none',
155 'dependencies': [ 167 'dependencies': [
156 '../../views/views.gyp:views', 168 '../../views/views.gyp:views',
157 '../../views/views.gyp:views_aura_desktop', 169 '../../views/views.gyp:views_aura_desktop',
158 '../../views/views.gyp:views_desktop', 170 '../../views/views.gyp:views_desktop',
159 '../../views/views.gyp:views_desktop_lib', 171 '../../views/views.gyp:views_desktop_lib',
160 '../../views/views.gyp:views_unittests', 172 '../../views/views.gyp:views_unittests',
161 '../aura/aura.gyp:*', 173 '../aura/aura.gyp:*',
162 '../gfx/compositor/compositor.gyp:*', 174 '../gfx/compositor/compositor.gyp:*',
163 'aura_shell_exe', 175 'aura_shell_exe',
164 ], 176 ],
165 }, 177 },
166 ], 178 ],
167 } 179 }
OLDNEW
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698