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

Side by Side Diff: skia/skia.gyp

Issue 10331008: Revert 135087 - This patch is to enable x86 android build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « build/common.gypi ('k') | third_party/yasm/README.chromium » ('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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'skia', 8 'target_name': 'skia',
9 'type': '<(component)', 9 'type': '<(component)',
10 'variables': { 10 'variables': {
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 'SK_BUILD_FOR_ANDROID_NDK', 1092 'SK_BUILD_FOR_ANDROID_NDK',
1093 ], 1093 ],
1094 }], 1094 }],
1095 [ 'target_arch != "arm"', { 1095 [ 'target_arch != "arm"', {
1096 'sources': [ 1096 'sources': [
1097 '../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp', 1097 '../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp',
1098 '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp', 1098 '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp',
1099 '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp', 1099 '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp',
1100 '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp', 1100 '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
1101 ], 1101 ],
1102 'conditions': [ 1102 'dependencies': [
1103 # x86 Android doesn't support SSSE3 instructions. 1103 'skia_opts_ssse3',
1104 [ 'OS != "android"', {
1105 'dependencies': [
1106 'skia_opts_ssse3',
1107 ],
1108 }],
1109 ], 1104 ],
1110 }, 1105 },
1111 { # arm 1106 { # arm
1112 'conditions': [ 1107 'conditions': [
1113 [ 'armv7 == 1', { 1108 [ 'armv7 == 1', {
1114 'defines': [ 1109 'defines': [
1115 '__ARM_ARCH__=7', 1110 '__ARM_ARCH__=7',
1116 ], 1111 ],
1117 }], 1112 }],
1118 [ 'armv7 == 1 and arm_neon == 1', { 1113 [ 'armv7 == 1 and arm_neon == 1', {
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
1261 ], 1256 ],
1262 'include_dirs': [ 1257 'include_dirs': [
1263 '..', 1258 '..',
1264 ], 1259 ],
1265 'sources': [ 1260 'sources': [
1266 'ext/image_operations_bench.cc', 1261 'ext/image_operations_bench.cc',
1267 ], 1262 ],
1268 }, 1263 },
1269 ], 1264 ],
1270 } 1265 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | third_party/yasm/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698