diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-01 18:56:30 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-01 18:56:30 +0000 |
| commit | 4baf618f9e5e2e3f6f76742d2049701ae085920e (patch) | |
| tree | edddbd79e637668b5fd7235e89036239ecb6bc4d /ash | |
| parent | 26fc97898a5b6752fa78020f604e1cab8aacca6e (diff) | |
| download | chromium_src-4baf618f9e5e2e3f6f76742d2049701ae085920e.zip chromium_src-4baf618f9e5e2e3f6f76742d2049701ae085920e.tar.gz chromium_src-4baf618f9e5e2e3f6f76742d2049701ae085920e.tar.bz2 | |
ash: Convert ash_resources to a normal GYP file.
It seems to be much more common to have this kind of resources file as a
normal GYP file rather than an *include* GYP file.
$ git ls-files | grep resources.gyp$ | grep -v ash_resources | wc -l
9
vs
$ git ls-files | grep resources.gypi$ | grep -v ash_resources | wc -l
3
BUG=None
TEST=None
R=jamescook@chromium.org
NOTRY=true
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/307993007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274130 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/ash.gyp | 19 | ||||
| -rw-r--r-- | ash/ash_resources.gyp (renamed from ash/ash_resources.gypi) | 2 |
2 files changed, 9 insertions, 12 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 3e2ddde..7e4b439 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -7,9 +7,6 @@ 'chromium_code': 1, 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', }, - 'includes': [ - 'ash_resources.gypi', - ], 'targets': [ { 'target_name': 'ash', @@ -43,8 +40,8 @@ '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', '../ui/wm/wm.gyp:wm', '../url/url.gyp:url_lib', + 'ash_resources.gyp:ash_resources', 'ash_strings.gyp:ash_strings', - 'ash_resources', ], 'defines': [ 'ASH_IMPLEMENTATION', @@ -763,9 +760,9 @@ '../ui/views/views.gyp:views', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', '../url/url.gyp:url_lib', - 'ash_strings.gyp:ash_strings', 'ash', - 'ash_resources', + 'ash_resources.gyp:ash_resources', + 'ash_strings.gyp:ash_strings', ], 'defines': [ 'ASH_WITH_CONTENT_IMPLEMENTATION', @@ -792,7 +789,7 @@ '../ui/app_list/app_list.gyp:app_list_test_support', '../ui/views/views.gyp:views_test_support', 'ash', - 'ash_resources', + 'ash_resources.gyp:ash_resources', ], 'sources': [ 'desktop_background/desktop_background_controller_test_api.cc', @@ -908,9 +905,9 @@ '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', '../ui/wm/wm.gyp:wm', '../url/url.gyp:url_lib', - 'ash_strings.gyp:ash_strings', 'ash', - 'ash_resources', + 'ash_resources.gyp:ash_resources', + 'ash_strings.gyp:ash_strings', 'ash_test_support', 'ash_with_content', ], @@ -1130,10 +1127,10 @@ '../ui/views/views.gyp:views', '../ui/views/views.gyp:views_test_support', 'ash', - 'ash_resources', + 'ash_resources.gyp:ash_resources', 'ash_strings.gyp:ash_strings', - 'ash_with_content', 'ash_test_support', + 'ash_with_content', ], 'sources': [ '../content/app/startup_helper_win.cc', diff --git a/ash/ash_resources.gypi b/ash/ash_resources.gyp index 68d93ef..930cde8 100644 --- a/ash/ash_resources.gypi +++ b/ash/ash_resources.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Copyright 2014 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. |