ui/resources/ui_resources.gyp - Issue 686503002: Move network_connect code to ui/chromeos/network

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: Created 6 years, 2 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:

Index: ui/resources/ui_resources.gyp

diff --git a/ui/resources/ui_resources.gyp b/ui/resources/ui_resources.gyp

index 69de7e5997693eab071c4e73d434a5d0456f18a4..10eb97db2241a9503a5f28ed3192966e29c126db 100644

--- a/ui/resources/ui_resources.gyp

+++ b/ui/resources/ui_resources.gyp

@@ -58,11 +58,25 @@

'<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',

'pak_output': '<(PRODUCT_DIR)/ui_test.pak',

+ 'conditions': [

+ ['chromeos==1', {

+ 'pak_inputs': [

+ '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_en-US.pak',

+ ],

+ }],

+ ],

'includes': [ '../../build/repack_action.gypi' ],

'conditions': [

+ ['chromeos==1', {

+ 'dependencies': [

+ '../chromeos/ui_chromeos.gyp:ui_chromeos_strings',

+ '../chromeos/ui_chromeos.gyp:ui_chromeos_resources',

+ ],

+ }],

['OS != "mac"', {

'copies': [

{