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

Side by Side Diff: ash/ash_resources.gyp

Issue 1994993003: Moves resources used by ash/wm/common to ash/wm/common/resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: repack chrome Created 4 years, 7 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
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 'targets': [ 6 'targets': [
7 { 7 {
8 # GN version: //ash/resources 8 # GN version: //ash/resources
9 'target_name': 'ash_resources', 9 'target_name': 'ash_resources',
10 'type': 'none', 10 'type': 'none',
(...skipping 14 matching lines...) Expand all
25 { 25 {
26 # Creates a 100% pak file containing resources for ash_unittests, etc. 26 # Creates a 100% pak file containing resources for ash_unittests, etc.
27 # TODO(msw): Use ui_test.pak instead of its pieces? (no 200% support?) 27 # TODO(msw): Use ui_test.pak instead of its pieces? (no 200% support?)
28 # TODO(msw): Add copy steps and mac handling like repack_ui_test_pack? 28 # TODO(msw): Add copy steps and mac handling like repack_ui_test_pack?
29 # GN version: //ash/resources:ash_test_resources_100_percent 29 # GN version: //ash/resources:ash_test_resources_100_percent
30 'target_name': 'ash_test_resources_100_percent', 30 'target_name': 'ash_test_resources_100_percent',
31 'type': 'none', 31 'type': 'none',
32 'dependencies': [ 32 'dependencies': [
33 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 33 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
34 'ash_resources', 34 'ash_resources',
35 '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
35 ], 36 ],
36 'actions': [ 37 'actions': [
37 { 38 {
38 'action_name': 'repack_ash_test_resources', 39 'action_name': 'repack_ash_test_resources',
39 'variables': { 40 'variables': {
40 'pak_output': '<(PRODUCT_DIR)/ash_test_resources_100_percent.pak', 41 'pak_output': '<(PRODUCT_DIR)/ash_test_resources_100_percent.pak',
41 'pak_inputs': [ 42 'pak_inputs': [
42 '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percen t.pak', 43 '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percen t.pak',
44 '<(SHARED_INTERMEDIATE_DIR)/ash/wm/common/resources/ash_wm_common_ resources_100_percent.pak',
43 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak', 45 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak',
44 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', 46 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
45 ], 47 ],
46 'conditions': [ 48 'conditions': [
47 ['chromeos==1', { 49 ['chromeos==1', {
48 'pak_inputs': [ 50 'pak_inputs': [
49 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_ resources_100_percent.pak', 51 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_ resources_100_percent.pak',
50 ], 52 ],
51 }], 53 }],
52 ['toolkit_views==1', { 54 ['toolkit_views==1', {
(...skipping 29 matching lines...) Expand all
82 { 84 {
83 # Creates a 200% pak file containing resources for ash_unittests, etc. 85 # Creates a 200% pak file containing resources for ash_unittests, etc.
84 # TODO(msw): Use ui_test.pak instead of its pieces? (no 200% support?) 86 # TODO(msw): Use ui_test.pak instead of its pieces? (no 200% support?)
85 # TODO(msw): Add copy steps and mac handling like repack_ui_test_pack? 87 # TODO(msw): Add copy steps and mac handling like repack_ui_test_pack?
86 # GN version: //ash/resources:ash_test_resources_200_percent 88 # GN version: //ash/resources:ash_test_resources_200_percent
87 'target_name': 'ash_test_resources_200_percent', 89 'target_name': 'ash_test_resources_200_percent',
88 'type': 'none', 90 'type': 'none',
89 'dependencies': [ 91 'dependencies': [
90 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 92 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
91 'ash_resources', 93 'ash_resources',
94 '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
92 ], 95 ],
93 'actions': [ 96 'actions': [
94 { 97 {
95 'action_name': 'repack_ash_test_resources', 98 'action_name': 'repack_ash_test_resources',
96 'variables': { 99 'variables': {
97 'pak_output': '<(PRODUCT_DIR)/ash_test_resources_200_percent.pak', 100 'pak_output': '<(PRODUCT_DIR)/ash_test_resources_200_percent.pak',
98 'pak_inputs': [ 101 'pak_inputs': [
99 '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_200_percen t.pak', 102 '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_200_percen t.pak',
103 '<(SHARED_INTERMEDIATE_DIR)/ash/wm/common/resources/ash_wm_common_ resources_200_percent.pak',
100 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent. pak', 104 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent. pak',
101 ], 105 ],
102 'conditions': [ 106 'conditions': [
103 ['chromeos==1', { 107 ['chromeos==1', {
104 'pak_inputs': [ 108 'pak_inputs': [
105 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_ resources_200_percent.pak', 109 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_ resources_200_percent.pak',
106 ], 110 ],
107 }], 111 }],
108 ['toolkit_views==1', { 112 ['toolkit_views==1', {
109 'pak_inputs': [ 113 'pak_inputs': [
(...skipping 18 matching lines...) Expand all
128 }], 132 }],
129 ['toolkit_views==1', { 133 ['toolkit_views==1', {
130 'dependencies': [ 134 'dependencies': [
131 '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources', 135 '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources',
132 ], 136 ],
133 }], 137 }],
134 ], 138 ],
135 }, 139 },
136 ], 140 ],
137 } 141 }
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/resources/BUILD.gn » ('j') | ash/shelf/shelf_widget.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698