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

Side by Side Diff: ui/ui.gyp

Issue 10377155: Move ui/gfx/resources to ui/base/native_theme/resources Step2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: keep gfx_resources.pak for DumpRenderTree Created 8 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'ui_resources.gypi', 10 'ui_resources.gypi',
(...skipping 12 matching lines...) Expand all
23 '../base/base.gyp:base_static', 23 '../base/base.gyp:base_static',
24 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 24 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
25 '../build/temp_gyp/googleurl.gyp:googleurl', 25 '../build/temp_gyp/googleurl.gyp:googleurl',
26 '../net/net.gyp:net', 26 '../net/net.gyp:net',
27 '../skia/skia.gyp:skia', 27 '../skia/skia.gyp:skia',
28 '../third_party/icu/icu.gyp:icui18n', 28 '../third_party/icu/icu.gyp:icui18n',
29 '../third_party/icu/icu.gyp:icuuc', 29 '../third_party/icu/icu.gyp:icuuc',
30 '../third_party/libpng/libpng.gyp:libpng', 30 '../third_party/libpng/libpng.gyp:libpng',
31 '../third_party/zlib/zlib.gyp:zlib', 31 '../third_party/zlib/zlib.gyp:zlib',
32 'base/strings/ui_strings.gyp:ui_strings', 32 'base/strings/ui_strings.gyp:ui_strings',
33 'gfx_resources', 33 'native_theme_resources',
34 '<(libjpeg_gyp_path):libjpeg', 34 '<(libjpeg_gyp_path):libjpeg',
35 ], 35 ],
36 'defines': [ 36 'defines': [
37 'UI_IMPLEMENTATION', 37 'UI_IMPLEMENTATION',
38 ], 38 ],
39 # Export these dependencies since text_elider.h includes ICU headers. 39 # Export these dependencies since text_elider.h includes ICU headers.
40 'export_dependent_settings': [ 40 'export_dependent_settings': [
41 '../net/net.gyp:net', 41 '../net/net.gyp:net',
42 '../third_party/icu/icu.gyp:icui18n', 42 '../third_party/icu/icu.gyp:icui18n',
43 '../third_party/icu/icu.gyp:icuuc', 43 '../third_party/icu/icu.gyp:icuuc',
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 ], 677 ],
678 }], 678 }],
679 ['os_bsd==1 and use_system_libjpeg==1', { 679 ['os_bsd==1 and use_system_libjpeg==1', {
680 'include_dirs': [ 680 'include_dirs': [
681 '/usr/local/include', 681 '/usr/local/include',
682 ], 682 ],
683 }], 683 }],
684 ], 684 ],
685 }, 685 },
686 { 686 {
687 'target_name': 'gfx_resources', 687 'target_name': 'native_theme_resources',
688 'type': 'none', 688 'type': 'none',
689 'variables': { 689 'variables': {
690 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx', 690 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme',
691 }, 691 },
692 'actions': [ 692 'actions': [
693 { 693 {
694 'action_name': 'gfx_resources', 694 'action_name': 'native_theme_resources',
695 'variables': { 695 'variables': {
696 'grit_grd_file': 'gfx/gfx_resources.grd', 696 'grit_grd_file': 'base/native_theme/resources/native_theme_resources .grd',
697 }, 697 },
698 'includes': [ '../build/grit_action.gypi' ], 698 'includes': [ '../build/grit_action.gypi' ],
699 }, 699 },
700 ], 700 ],
701 # gfx_resources.pak is used by DumpRenderTree.
702 # TODO(oshima): Update DumpRenderTree.gyp to use new pak file and
703 # remove this.
704 'copies': [ {
705 'destination': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/',
706 'files' : [
707 '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/gfx_resources.pak',
708 ],
709 },
710 ],
701 'includes': [ '../build/grit_target.gypi' ], 711 'includes': [ '../build/grit_target.gypi' ],
702 }, 712 },
703 ], 713 ],
704 'conditions': [ 714 'conditions': [
705 ['inside_chromium_build==1', { 715 ['inside_chromium_build==1', {
706 'includes': [ 716 'includes': [
707 'ui_unittests.gypi', 717 'ui_unittests.gypi',
708 ], 718 ],
709 'targets': [ 719 'targets': [
710 { 720 {
(...skipping 20 matching lines...) Expand all
731 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \ 741 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
732 'os.chmod(\'<(ui_copy_dest)\', 0700)' 742 'os.chmod(\'<(ui_copy_dest)\', 0700)'
733 ] 743 ]
734 } 744 }
735 ], 745 ],
736 }, 746 },
737 ], 747 ],
738 }], 748 }],
739 ], 749 ],
740 } 750 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698