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

Side by Side Diff: trunk/src/athena/resources/athena_resources.gyp

Issue 404533002: Revert 283774 "Fix silly mistakes" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | « no previous file | trunk/src/athena/wm/window_manager_impl.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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 {
11 'target_name': 'athena_resources', 11 'target_name': 'athena_resources',
12 'type': 'none', 12 'type': 'none',
13 'dependencies': [ 13 'dependencies': [
14 '../../apps/shell/app_shell.gyp:app_shell_pak', 14 '../../apps/shell/app_shell.gyp:app_shell_pak',
15 '../../ash/ash_resources.gyp:ash_resources', 15 '../../ash/ash_resources.gyp:ash_resources',
16 '../../content/content_resources.gyp:content_resources', 16 '../../content/content_resources.gyp:content_resources',
17 '../../ui/resources/ui_resources.gyp:ui_resources',
18 '../../webkit/webkit_resources.gyp:webkit_resources', 17 '../../webkit/webkit_resources.gyp:webkit_resources',
19 '../../webkit/webkit_resources.gyp:webkit_strings', 18 '../../webkit/webkit_resources.gyp:webkit_strings',
20 ], 19 ],
21 'actions': [{ 20 'actions': [{
22 'action_name': 'repack_athena_pack', 21 'action_name': 'repack_athena_pack',
23 'variables': { 22 'variables': {
24 'pak_inputs': [ 23 'pak_inputs': [
25 '<(PRODUCT_DIR)/app_shell.pak', 24 '<(PRODUCT_DIR)/app_shell.pak',
26 '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent. pak', 25 '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent. pak',
27 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', 26 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
28 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pa k',
29 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', 27 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
30 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', 28 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
31 ], 29 ],
32 'pak_output': '<(PRODUCT_DIR)/athena_resources.pak', 30 'pak_output': '<(PRODUCT_DIR)/athena_resources.pak',
33 }, 31 },
34 'includes': [ '../../build/repack_action.gypi' ], 32 'includes': [ '../../build/repack_action.gypi' ],
35 }], 33 }],
36 }, 34 },
37 ] 35 ]
38 } 36 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/athena/wm/window_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698