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

Side by Side Diff: ash/ash_resources.gyp

Issue 1934213002: Set enable_app_list=1 now only on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160429-AppList0
Patch Set: fix ash_test_resources 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
« no previous file with comments | « no previous file | ash/resources/BUILD.gn » ('j') | testing/buildbot/chromium_trybot.json » ('J')
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 '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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 'conditions': [ 46 'conditions': [
47 ['chromeos==1', { 47 ['chromeos==1', {
48 'pak_inputs': [ 48 'pak_inputs': [
49 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_ resources_100_percent.pak', 49 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_ resources_100_percent.pak',
50 ], 50 ],
51 }], 51 }],
52 ['toolkit_views==1', { 52 ['toolkit_views==1', {
53 'pak_inputs': [ 53 'pak_inputs': [
54 # TODO(msw): This seems bad, but follows repack_ui_test_pack's example. 54 # TODO(msw): This seems bad, but follows repack_ui_test_pack's example.
55 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resou rces.pak', 55 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resou rces.pak',
56 '<(SHARED_INTERMEDIATE_DIR)/ui/app_list/resources/app_list_res ources_100_percent.pak',
56 '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources _100_percent.pak', 57 '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources _100_percent.pak',
57 ], 58 ],
58 }], 59 }],
59 ['enable_app_list==1', {
60 'pak_inputs': [
61 '<(SHARED_INTERMEDIATE_DIR)/ui/app_list/resources/app_list_res ources_100_percent.pak',
62 ],
63 }],
64 ], 60 ],
65 }, 61 },
66 'includes': [ '../build/repack_action.gypi' ], 62 'includes': [ '../build/repack_action.gypi' ],
67 }, 63 },
68 ], 64 ],
69 'conditions': [ 65 'conditions': [
70 ['chromeos==1', { 66 ['chromeos==1', {
71 'dependencies': [ 67 'dependencies': [
72 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', 68 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
73 ], 69 ],
(...skipping 26 matching lines...) Expand all
100 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent. pak', 96 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent. pak',
101 ], 97 ],
102 'conditions': [ 98 'conditions': [
103 ['chromeos==1', { 99 ['chromeos==1', {
104 'pak_inputs': [ 100 'pak_inputs': [
105 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_ resources_200_percent.pak', 101 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_ resources_200_percent.pak',
106 ], 102 ],
107 }], 103 }],
108 ['toolkit_views==1', { 104 ['toolkit_views==1', {
109 'pak_inputs': [ 105 'pak_inputs': [
106 '<(SHARED_INTERMEDIATE_DIR)/ui/app_list/resources/app_list_res ources_200_percent.pak',
110 '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources _200_percent.pak', 107 '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources _200_percent.pak',
111 ], 108 ],
112 }], 109 }],
113 ['enable_app_list==1', {
114 'pak_inputs': [
115 '<(SHARED_INTERMEDIATE_DIR)/ui/app_list/resources/app_list_res ources_200_percent.pak',
116 ],
117 }],
118 ], 110 ],
119 }, 111 },
120 'includes': [ '../build/repack_action.gypi' ], 112 'includes': [ '../build/repack_action.gypi' ],
121 }, 113 },
122 ], 114 ],
123 'conditions': [ 115 'conditions': [
124 ['chromeos==1', { 116 ['chromeos==1', {
125 'dependencies': [ 117 'dependencies': [
126 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', 118 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
127 ], 119 ],
128 }], 120 }],
129 ['toolkit_views==1', { 121 ['toolkit_views==1', {
130 'dependencies': [ 122 'dependencies': [
131 '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources', 123 '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources',
132 ], 124 ],
133 }], 125 }],
134 ], 126 ],
135 }, 127 },
136 ], 128 ],
137 } 129 }
OLDNEW
« no previous file with comments | « no previous file | ash/resources/BUILD.gn » ('j') | testing/buildbot/chromium_trybot.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698