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

Unified Diff: skia/skia.gyp

Issue 14065005: Introduce arm_version to allow building for armv5, v6 or v7. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update gyp defaults Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« build/common.gypi ('K') | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia.gyp
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 7712b929e3795a867af0b0ba68afa83713b1601a..71362976aed079dbe44f3c41728c4244383a2799 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -340,12 +340,12 @@
[ 'OS != "win"', {
'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ],
}],
- [ 'armv7 == 1', {
+ [ 'arm_version == 7', {
'defines': [
'__ARM_ARCH__=7',
Torne 2013/04/11 13:04:22 We could just define __ARM_ARCH__=<(arm_version) ?
Fredrik Öhrn 2013/04/11 13:42:19 Sure, but it looks like it's not used in skia. Sha
Torne 2013/04/11 13:55:00 Probably this can be removed then, yes.
],
}],
- [ 'armv7 == 1 and arm_neon == 1', {
+ [ 'arm_version >= 7 and arm_neon == 1', {
'defines': [
'__ARM_HAVE_NEON',
],
@@ -671,12 +671,12 @@
}],
[ 'target_arch == "arm"', {
'conditions': [
- [ 'armv7 == 1', {
+ [ 'arm_version == 7', {
'defines': [
'__ARM_ARCH__=7',
],
}],
- [ 'armv7 == 1 and arm_neon == 1', {
+ [ 'arm_version >= 7 and arm_neon == 1', {
'defines': [
'__ARM_HAVE_NEON',
],
@@ -705,12 +705,12 @@
'../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
],
}],
- [ 'armv7 == 1 and arm_neon == 0', {
+ [ 'target_arch == "arm" and (arm_version < 7 or arm_neon == 0)', {
'sources': [
'../third_party/skia/src/opts/memset.arm.S',
],
}],
- [ 'armv7 == 1 and arm_neon == 1', {
+ [ 'target_arch == "arm" and arm_version >= 7 and arm_neon == 1', {
'sources': [
'../third_party/skia/src/opts/memset16_neon.S',
'../third_party/skia/src/opts/memset32_neon.S',
@@ -721,13 +721,13 @@
'../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp',
],
}],
- [ 'target_arch == "arm" and armv7 == 0', {
+ [ 'target_arch == "arm" and arm_version < 6', {
'sources': [
'../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
'../third_party/skia/src/opts/SkUtils_opts_none.cpp',
],
}],
- [ 'target_arch == "arm" and armv7 == 1', {
+ [ 'target_arch == "arm" and arm_version >= 6', {
'sources': [
'../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
'../third_party/skia/src/opts/SkBlitRow_opts_arm.h',
« build/common.gypi ('K') | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698