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

Update Android toolchain to NDK r8d with GCC 4.7

Browse Source 
Review URL: https://codereview.appspot.com/7201045

git-svn-id: http://skia.googlecode.com/svn/trunk@7343 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
djsollen@google.com 2013-01-23 18:56:38 +00:00
parent bcede394ee
commit 4dcc624ee0
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gyp/common_conditions.gypi
View File

@ -315,14 +315,6 @@
'-fno-exceptions', '-fno-exceptions',
'-fno-rtti', '-fno-rtti',
'-fuse-ld=gold', '-fuse-ld=gold',
'--sysroot=<(android_base)/toolchains/<(android_toolchain)/sysroot',
],
'include_dirs' : [
'<(android_base)/toolchains/<(android_toolchain)/lib/gcc/arm-linux-androideabi/4.6.x-google/include',
'<(android_base)/toolchains/<(android_toolchain)/lib/gcc/arm-linux-androideabi/4.6.x-google/include-fixed',
'<(android_base)/toolchains/<(android_toolchain)/arm-linux-androideabi/include/c++/4.6',
'<(android_base)/toolchains/<(android_toolchain)/arm-linux-androideabi/include/c++/4.6/arm-linux-androideabi',
'<(android_base)/toolchains/<(android_toolchain)/sysroot/usr/include',
], ],
'conditions': [ 'conditions': [
[ 'skia_warnings_as_errors == 1', { [ 'skia_warnings_as_errors == 1', {
@ -333,11 +325,6 @@
[ 'skia_profile_enabled == 1', { [ 'skia_profile_enabled == 1', {
'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
}], }],
[ 'skia_arch_type == "arm"', {
'ldflags': [
'-Wl',
],
}],
[ 'skia_arch_type == "arm" and arm_thumb == 1', { [ 'skia_arch_type == "arm" and arm_thumb == 1', {
'cflags': [ 'cflags': [
'-mthumb', '-mthumb',
@ -362,6 +349,10 @@
'cflags': [ 'cflags': [
'-mfpu=neon', '-mfpu=neon',
], ],
'ldflags': [
'-march=armv7-a',
'-Wl,--fix-cortex-a8',
],
}], }],
[ 'arm_neon_optional == 1', { [ 'arm_neon_optional == 1', {
'defines': [ 'defines': [

4
gyp/opts.gyp
View File

@ -158,6 +158,10 @@
'-mfpu=neon', '-mfpu=neon',
'-fomit-frame-pointer', '-fomit-frame-pointer',
], ],
'ldflags': [
'-march=armv7-a',
'-Wl,--fix-cortex-a8',
],
'sources': [ 'sources': [
'../src/opts/memset16_neon.S', '../src/opts/memset16_neon.S',
'../src/opts/memset32_neon.S', '../src/opts/memset32_neon.S',