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

Side by Side Diff: skia/skia.gyp

Issue 639423005: Remove use_system_skia and skia_system.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove another instance of use_system_skia Created 6 years, 1 month 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
« no previous file with comments | « build/common.gypi ('k') | skia/skia_system.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'conditions': [ 6 'conditions': [
7 # In component mode (shared_lib), we build all of skia as a single DLL. 7 # In component mode (shared_lib), we build all of skia as a single DLL.
8 # However, in the static mode, we need to build skia as multiple targets 8 # However, in the static mode, we need to build skia as multiple targets
9 # in order to support the use case where a platform (e.g. Android) may 9 # in order to support the use case where a platform (e.g. Android) may
10 # already have a copy of skia as a system library. 10 # already have a copy of skia as a system library.
11 ['component=="static_library" and use_system_skia==0', { 11 ['component=="static_library"', {
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'skia_library', 14 'target_name': 'skia_library',
15 'type': 'static_library', 15 'type': 'static_library',
16 'includes': [ 16 'includes': [
17 'skia_library.gypi', 17 'skia_library.gypi',
18 'skia_common.gypi', 18 'skia_common.gypi',
19 '../build/android/increase_size_for_speed.gypi', 19 '../build/android/increase_size_for_speed.gypi',
20 # Disable LTO due to compiler error 20 # Disable LTO due to compiler error
21 # in mems_in_disjoint_alias_sets_p, at alias.c:393 21 # in mems_in_disjoint_alias_sets_p, at alias.c:393
22 # crbug.com/422255 22 # crbug.com/422255
23 '../build/android/disable_lto.gypi', 23 '../build/android/disable_lto.gypi',
24 ], 24 ],
25 }, 25 },
26 ], 26 ],
27 }], 27 }],
28 ['component=="static_library" and use_system_skia==1', {
29 'targets': [
30 {
31 'target_name': 'skia_library',
32 'type': 'none',
33 'includes': [
34 'skia_system.gypi',
35 '../build/android/increase_size_for_speed.gypi',
36 ],
37 },
38 ],
39 }],
40 ['component=="static_library"', { 28 ['component=="static_library"', {
41 'targets': [ 29 'targets': [
42 { 30 {
43 'target_name': 'skia', 31 'target_name': 'skia',
44 'type': 'none', 32 'type': 'none',
45 'dependencies': [ 33 'dependencies': [
46 'skia_library', 34 'skia_library',
47 'skia_chrome', 35 'skia_chrome',
48 ], 36 ],
49 'export_dependent_settings': [ 37 'export_dependent_settings': [
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 ], 142 ],
155 'sources': [ 143 'sources': [
156 'tools/filter_fuzz_stub/filter_fuzz_stub.cc', 144 'tools/filter_fuzz_stub/filter_fuzz_stub.cc',
157 ], 145 ],
158 'includes': [ 146 'includes': [
159 '../build/android/increase_size_for_speed.gypi', 147 '../build/android/increase_size_for_speed.gypi',
160 ], 148 ],
161 }, 149 },
162 ], 150 ],
163 } 151 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | skia/skia_system.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698