ash/ash_resources.gyp - Issue 2026973002: Moves ash/wm/common/resources back to ash

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: ash/ash_resources.gyp

Issue 2026973002: Moves ash/wm/common/resources back to ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: delete revived file 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:

Index: ash/ash_resources.gyp

diff --git a/ash/ash_resources.gyp b/ash/ash_resources.gyp

index 0c51787448c85a5f5ad754d702b55839a8069b65..cae3d14f98832ef768270ba7636e8987a54274ab 100644

--- a/ash/ash_resources.gyp

+++ b/ash/ash_resources.gyp

@@ -32,7 +32,6 @@

'dependencies': [

'<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',

'ash_resources',

- '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',

'actions': [

{

@@ -41,7 +40,6 @@

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

'pak_inputs': [

'<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak',

- '<(SHARED_INTERMEDIATE_DIR)/ash/wm/common/resources/ash_wm_common_resources_100_percent.pak',

'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',

'<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',

@@ -87,7 +85,6 @@

'dependencies': [

'<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',

'ash_resources',

- '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',

'actions': [

{

@@ -96,7 +93,6 @@

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

'pak_inputs': [

'<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_200_percent.pak',

- '<(SHARED_INTERMEDIATE_DIR)/ash/wm/common/resources/ash_wm_common_resources_200_percent.pak',

'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent.pak',

'conditions': [

« no previous file with comments | « ash/ash.gyp ('k') | ash/resources/BUILD.gn » ('j') | no next file with comments »