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

Side by Side Diff: ui/resources/ui_resources.gyp

Issue 686503002: Move network_connect code to ui/chromeos/network (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update .gn files, feedback Created 6 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
« ui/resources/BUILD.gn ('K') | « ui/resources/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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: //ui/resources 8 # GN version: //ui/resources
9 'target_name': 'ui_resources', 9 'target_name': 'ui_resources',
10 'type': 'none', 10 'type': 'none',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 { 51 {
52 'action_name': 'repack_ui_test_pack', 52 'action_name': 'repack_ui_test_pack',
53 'variables': { 53 'variables': {
54 'pak_inputs': [ 54 'pak_inputs': [
55 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak', 55 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak',
56 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', 56 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
57 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak', 57 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak',
58 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak', 58 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
59 ], 59 ],
60 'pak_output': '<(PRODUCT_DIR)/ui_test.pak', 60 'pak_output': '<(PRODUCT_DIR)/ui_test.pak',
61 'conditions': [
62 ['chromeos==1', {
63 'pak_inputs': [
64 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_ resources_100_percent.pak',
65 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_st rings_en-US.pak',
66 ],
67 }],
68 ],
61 }, 69 },
62 'includes': [ '../../build/repack_action.gypi' ], 70 'includes': [ '../../build/repack_action.gypi' ],
63 }, 71 },
64 ], 72 ],
65 'conditions': [ 73 'conditions': [
74 ['chromeos==1', {
75 'dependencies': [
76 '../chromeos/ui_chromeos.gyp:ui_chromeos_strings',
77 '../chromeos/ui_chromeos.gyp:ui_chromeos_resources',
78 ],
79 }],
66 ['OS != "mac"', { 80 ['OS != "mac"', {
67 'copies': [ 81 'copies': [
68 { 82 {
69 # GN version //ui/resources:copy_ui_resources_100_percent 83 # GN version //ui/resources:copy_ui_resources_100_percent
70 'destination': '<(PRODUCT_DIR)/ui', 84 'destination': '<(PRODUCT_DIR)/ui',
71 'files': [ 85 'files': [
72 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percen t.pak', 86 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percen t.pak',
73 ], 87 ],
74 }, 88 },
75 ], 89 ],
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 '<@(_inputs)', 126 '<@(_inputs)',
113 '<@(_outputs)' 127 '<@(_outputs)'
114 ], 128 ],
115 }, 129 },
116 ], 130 ],
117 }], 131 }],
118 ], 132 ],
119 }, 133 },
120 ], 134 ],
121 } 135 }
OLDNEW
« ui/resources/BUILD.gn ('K') | « ui/resources/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698