AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable 32/64-bit gyp switch on Android

Browse Source 
Select 32/64-bit Skia build according skia_arch_width on Android.

BUG=skia:
R=djsollen@google.com, mtklein@google.com

Author: qiankun.miao@intel.com

Review URL: https://codereview.chromium.org/369813003
This commit is contained in:
qiankun.miao 2014-07-07 09:47:24 -07:00 committed by Commit bot
parent 0b7813b8c5
commit d312a04ffa
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gyp/common_conditions.gypi
View File

@ -191,6 +191,26 @@
'-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what is POD.
],
'conditions': [
[ 'skia_os != "chromeos"', {
'conditions': [
[ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
'cflags': [
'-m64',
],
'ldflags': [
'-m64',
],
}],
[ 'skia_arch_width == 32 and skia_arch_type == "x86"', {
'cflags': [
'-m32',
],
'ldflags': [
'-m32',
],
}],
],
}],
[ 'skia_android_framework==0', {
'cflags': [
# This flag is not supported by Android build system.
@ -422,26 +442,6 @@
],
},
}],
[ 'skia_os != "chromeos"', {
'conditions': [
[ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
'cflags': [
'-m64',
],
'ldflags': [
'-m64',
],
}],
[ 'skia_arch_width == 32 and skia_arch_type == "x86"', {
'cflags': [
'-m32',
],
'ldflags': [
'-m32',
],
}],
],
}],
# Enable asan, tsan, etc.
[ 'skia_sanitizer', {
'cflags': [