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

Side by Side Diff: gyp/skia_lib.gyp

Issue 420183004: Force linking as C++ library. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: with skimage expectations Created 6 years, 4 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
OLDNEW
1 # The minimal set of static libraries for basic Skia functionality. 1 # The minimal set of static libraries for basic Skia functionality.
2 2
3 { 3 {
4 'variables': { 4 'variables': {
5 'component_libs': [ 5 'component_libs': [
6 'core.gyp:core', 6 'core.gyp:core',
7 'effects.gyp:effects', 7 'effects.gyp:effects',
8 'images.gyp:images', 8 'images.gyp:images',
9 'opts.gyp:opts', 9 'opts.gyp:opts',
10 'ports.gyp:ports', 10 'ports.gyp:ports',
(...skipping 15 matching lines...) Expand all
26 [ 'skia_gpu', { 26 [ 'skia_gpu', {
27 'component_libs': [ 27 'component_libs': [
28 'gpu.gyp:skgpu', 28 'gpu.gyp:skgpu',
29 ], 29 ],
30 }], 30 }],
31 ], 31 ],
32 }, 32 },
33 'targets': [ 33 'targets': [
34 { 34 {
35 'target_name': 'skia_lib', 35 'target_name': 'skia_lib',
36 'sources': [ '<(skia_src_path)/core/SkForceCPlusPlusLinking.cpp', ],
36 'conditions': [ 37 'conditions': [
37 [ 'skia_shared_lib', { 38 [ 'skia_shared_lib', {
38 'conditions': [ 39 'conditions': [
39 [ 'skia_os == "android"', { 40 [ 'skia_os == "android"', {
40 # The name skia will confuse the linker on android into using the system's libskia.so 41 # The name skia will confuse the linker on android into using the system's libskia.so
41 # instead of the one packaged with the apk. We simply choose a dif ferent name to fix 42 # instead of the one packaged with the apk. We simply choose a dif ferent name to fix
42 # this. 43 # this.
43 'product_name': 'skia_android', 44 'product_name': 'skia_android',
44 }, { 45 }, {
45 'product_name': 'skia', 46 'product_name': 'skia',
46 }], 47 }],
47 ], 48 ],
48 'type': 'shared_library', 49 'type': 'shared_library',
49 }, { 50 }, {
50 'type': 'none', 51 'type': 'none',
51 }], 52 }],
52 ], 53 ],
53 'dependencies': [ 54 'dependencies': [
54 '<@(component_libs)', 55 '<@(component_libs)',
55 ], 56 ],
56 'export_dependent_settings': [ 57 'export_dependent_settings': [
57 '<@(component_libs)', 58 '<@(component_libs)',
58 ], 59 ],
59 }, 60 },
60 ], 61 ],
61 } 62 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698