| Index: ash/wm/common/ash_wm_common_resources.gyp
|
| diff --git a/content/app/resources/content_resources.gyp b/ash/wm/common/ash_wm_common_resources.gyp
|
| similarity index 52%
|
| copy from content/app/resources/content_resources.gyp
|
| copy to ash/wm/common/ash_wm_common_resources.gyp
|
| index f47eb9e900a17f9c11dee58a204b0d2163f43031..19567fcb7209c0731357528cf75705bf51c81b08 100644
|
| --- a/content/app/resources/content_resources.gyp
|
| +++ b/ash/wm/common/ash_wm_common_resources.gyp
|
| @@ -1,26 +1,26 @@
|
| -# Copyright 2014 The Chromium Authors. All rights reserved.
|
| +# Copyright 2016 The Chromium Authors. All rights reserved.
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| {
|
| 'targets': [
|
| {
|
| - # GN version: //content/app/resources
|
| - 'target_name': 'content_resources',
|
| + # GN version: //ash/wm/common/resources
|
| + 'target_name': 'ash_wm_common_resources',
|
| 'type': 'none',
|
| 'variables': {
|
| - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/',
|
| + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash/wm/common/resources',
|
| },
|
| 'actions': [
|
| {
|
| - 'action_name': 'generate_content_resources',
|
| + 'action_name': 'ash_wm_common_resources',
|
| 'variables': {
|
| - 'grit_grd_file': 'content_resources.grd',
|
| + 'grit_grd_file': 'resources/ash_wm_common_resources.grd',
|
| },
|
| 'includes': [ '../../../build/grit_action.gypi' ],
|
| },
|
| ],
|
| 'includes': [ '../../../build/grit_target.gypi' ],
|
| },
|
| - ]
|
| + ],
|
| }
|
|
|