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

Side by Side Diff: gyp/core.gyp

Issue 305593002: Use SkAtomics_sync on Android (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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
« no previous file with comments | « gyp/common_conditions.gypi ('k') | gyp/ports.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Core Skia library code. 1 # Core Skia library code.
2 { 2 {
3 'targets': [ 3 'targets': [
4 { 4 {
5 'target_name': 'core', 5 'target_name': 'core',
6 'product_name': 'skia_core', 6 'product_name': 'skia_core',
7 'type': 'static_library', 7 'type': 'static_library',
8 'standalone_static_library': 1, 8 'standalone_static_library': 1,
9 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', 9 'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76',
10 10
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 [ 'skia_os == "win"', { 73 [ 'skia_os == "win"', {
74 'include_dirs': [ 74 'include_dirs': [
75 'config/win', 75 'config/win',
76 ], 76 ],
77 }], 77 }],
78 [ 'skia_os == "android"', { 78 [ 'skia_os == "android"', {
79 'dependencies': [ 79 'dependencies': [
80 'android_deps.gyp:cpu_features', 80 'android_deps.gyp:cpu_features',
81 ], 81 ],
82 }], 82 }],
83 [ 'skia_android_framework', {
84 'libraries': [
85 # Required for SkAtomics_android.h
86 '-lcutils',
87 ],
88 }],
89 [ 'skia_arch_type == "arm"', { 83 [ 'skia_arch_type == "arm"', {
90 # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android. 84 # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android.
91 'sources': [ 85 'sources': [
92 '../src/core/SkUtilsArm.cpp', 86 '../src/core/SkUtilsArm.cpp',
93 '../src/core/SkUtilsArm.h', 87 '../src/core/SkUtilsArm.h',
94 ], 88 ],
95 }], 89 }],
96 ['skia_gpu == 1', { 90 ['skia_gpu == 1', {
97 'include_dirs': [ 91 'include_dirs': [
98 '../include/gpu', 92 '../include/gpu',
(...skipping 22 matching lines...) Expand all
121 [ 'skia_os == "win"', { 115 [ 'skia_os == "win"', {
122 'include_dirs': [ 116 'include_dirs': [
123 'config/win', 117 'config/win',
124 ], 118 ],
125 }], 119 }],
126 ], 120 ],
127 }, 121 },
128 }, 122 },
129 ], 123 ],
130 } 124 }
OLDNEW
« no previous file with comments | « gyp/common_conditions.gypi ('k') | gyp/ports.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698