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

Side by Side Diff: gyp/skia_lib.gyp

Issue 916113002: Don't use m32 cflag for x86_64. (Closed) Base URL: https://skia.googlesource.com/skia.git@baselijne
Patch Set: Make desktops distinguish between x86 and x86_64 Created 5 years, 10 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
« no previous file with comments | « gyp/opts.gyp ('k') | platform_tools/android/bin/android_setup.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
11 'sfnt.gyp:sfnt', 11 'sfnt.gyp:sfnt',
12 'utils.gyp:utils', 12 'utils.gyp:utils',
13 ], 13 ],
14 'conditions': [ 14 'conditions': [
15 [ 'skia_arch_type == "x86" and skia_os != "android"', { 15 [ '"x86" in skia_arch_type and skia_os != "android"', {
16 'component_libs': [ 16 'component_libs': [
17 'opts.gyp:opts_ssse3', 17 'opts.gyp:opts_ssse3',
18 'opts.gyp:opts_sse41', 18 'opts.gyp:opts_sse41',
19 ], 19 ],
20 }], 20 }],
21 [ 'arm_neon == 1', { 21 [ 'arm_neon == 1', {
22 'component_libs': [ 22 'component_libs': [
23 'opts.gyp:opts_neon', 23 'opts.gyp:opts_neon',
24 ], 24 ],
25 }], 25 }],
(...skipping 27 matching lines...) Expand all
53 ], 53 ],
54 'dependencies': [ 54 'dependencies': [
55 '<@(component_libs)', 55 '<@(component_libs)',
56 ], 56 ],
57 'export_dependent_settings': [ 57 'export_dependent_settings': [
58 '<@(component_libs)', 58 '<@(component_libs)',
59 ], 59 ],
60 }, 60 },
61 ], 61 ],
62 } 62 }
OLDNEW
« no previous file with comments | « gyp/opts.gyp ('k') | platform_tools/android/bin/android_setup.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698