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

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

Issue 10806018: Revert 147288 - Renamed resource files to be more verbose, specifically: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_shell.gypi ('k') | ui/base/resource/resource_bundle_android.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 '<(DEPTH)/ui/ui.gyp:ui_resources', 184 '<(DEPTH)/ui/ui.gyp:ui_resources',
185 ], 185 ],
186 'variables': { 186 'variables': {
187 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', 187 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
188 }, 188 },
189 'actions': [ 189 'actions': [
190 { 190 {
191 'action_name': 'repack_test_support_aura_pack', 191 'action_name': 'repack_test_support_aura_pack',
192 'variables': { 192 'variables': {
193 'pak_inputs': [ 193 'pak_inputs': [
194 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_perce nt.pak', 194 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard. pak',
195 ], 195 ],
196 }, 196 },
197 'inputs': [ 197 'inputs': [
198 '<(repack_path)', 198 '<(repack_path)',
199 '<@(pak_inputs)', 199 '<@(pak_inputs)',
200 ], 200 ],
201 'outputs': [ 201 'outputs': [
202 '<(PRODUCT_DIR)/test_support_aura_resources.pak', 202 '<(PRODUCT_DIR)/test_support_aura_resources.pak',
203 ], 203 ],
204 'action': ['python', '<(repack_path)', '<@(_outputs)', 204 'action': ['python', '<(repack_path)', '<@(_outputs)',
(...skipping 14 matching lines...) Expand all
219 '../compositor/compositor.gyp:compositor_test_support', 219 '../compositor/compositor.gyp:compositor_test_support',
220 '../ui.gyp:ui', 220 '../ui.gyp:ui',
221 '../ui.gyp:ui_resources', 221 '../ui.gyp:ui_resources',
222 'aura', 222 'aura',
223 ], 223 ],
224 'include_dirs': [ 224 'include_dirs': [
225 '..', 225 '..',
226 ], 226 ],
227 'sources': [ 227 'sources': [
228 'demo/demo_main.cc', 228 'demo/demo_main.cc',
229 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc' , 229 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
230 ], 230 ],
231 }, 231 },
232 { 232 {
233 'target_name': 'aura_bench', 233 'target_name': 'aura_bench',
234 'type': 'executable', 234 'type': 'executable',
235 'dependencies': [ 235 'dependencies': [
236 '../../base/base.gyp:base', 236 '../../base/base.gyp:base',
237 '../../base/base.gyp:base_i18n', 237 '../../base/base.gyp:base_i18n',
238 '../../skia/skia.gyp:skia', 238 '../../skia/skia.gyp:skia',
239 '../../third_party/icu/icu.gyp:icui18n', 239 '../../third_party/icu/icu.gyp:icui18n',
240 '../../third_party/icu/icu.gyp:icuuc', 240 '../../third_party/icu/icu.gyp:icuuc',
241 '../compositor/compositor.gyp:compositor', 241 '../compositor/compositor.gyp:compositor',
242 '../compositor/compositor.gyp:compositor_test_support', 242 '../compositor/compositor.gyp:compositor_test_support',
243 '../ui.gyp:ui', 243 '../ui.gyp:ui',
244 '../ui.gyp:ui_resources', 244 '../ui.gyp:ui_resources',
245 'aura', 245 'aura',
246 ], 246 ],
247 'include_dirs': [ 247 'include_dirs': [
248 '..', 248 '..',
249 ], 249 ],
250 'sources': [ 250 'sources': [
251 'bench/bench_main.cc', 251 'bench/bench_main.cc',
252 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc' , 252 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
253 ], 253 ],
254 }, 254 },
255 { 255 {
256 'target_name': 'aura_unittests', 256 'target_name': 'aura_unittests',
257 'type': 'executable', 257 'type': 'executable',
258 'dependencies': [ 258 'dependencies': [
259 '../../base/base.gyp:test_support_base', 259 '../../base/base.gyp:test_support_base',
260 '../../chrome/chrome_resources.gyp:packed_resources', 260 '../../chrome/chrome_resources.gyp:packed_resources',
261 '../../skia/skia.gyp:skia', 261 '../../skia/skia.gyp:skia',
262 '../../testing/gtest.gyp:gtest', 262 '../../testing/gtest.gyp:gtest',
(...skipping 13 matching lines...) Expand all
276 'gestures/gesture_recognizer_unittest.cc', 276 'gestures/gesture_recognizer_unittest.cc',
277 'test/run_all_unittests.cc', 277 'test/run_all_unittests.cc',
278 'test/test_suite.cc', 278 'test/test_suite.cc',
279 'test/test_suite.h', 279 'test/test_suite.h',
280 'root_window_unittest.cc', 280 'root_window_unittest.cc',
281 'shared/compound_event_filter_unittest.cc', 281 'shared/compound_event_filter_unittest.cc',
282 'shared/input_method_event_filter_unittest.cc', 282 'shared/input_method_event_filter_unittest.cc',
283 'event_filter_unittest.cc', 283 'event_filter_unittest.cc',
284 'event_unittest.cc', 284 'event_unittest.cc',
285 'window_unittest.cc', 285 'window_unittest.cc',
286 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc' , 286 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
287 ], 287 ],
288 'conditions': [ 288 'conditions': [
289 # osmesa GL implementation is used on linux. 289 # osmesa GL implementation is used on linux.
290 ['OS=="linux"', { 290 ['OS=="linux"', {
291 'dependencies': [ 291 'dependencies': [
292 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 292 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
293 ], 293 ],
294 }], 294 }],
295 ], 295 ],
296 }, 296 },
297 ], 297 ],
298 } 298 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | ui/base/resource/resource_bundle_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698