diff options
| author |  borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-25 15:17:03 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-25 15:17:03 +0000 |
| commit | de9ac1446c4e2b231af83337186105ec7350c751 (patch) | |
| tree | 3a32b5121cc5f28ebbc2ec0f58b5fd406eddbfde | |
| parent | bba65d9a5e2fd5cae4531bac535fb2c88b010aed (diff) | |
Fix Android build for new toolchain
The new toolchain (r8b) does not automatically include
the necessary directories
(http://code.google.com/p/android/issues/detail?id=35279).
Add them manually until this is fixed.
Review URL: https://codereview.appspot.com/6419076
git-svn-id: http://skia.googlecode.com/svn/trunk@4749 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/common_conditions.gypi | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 6ccaa462b5..2f58c1b6e6 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -211,12 +211,20 @@ 'cflags': [ '-fno-exceptions', '-fno-rtti', + '-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': [ [ 'skia_arch_type == "arm"', { 'ldflags': [ '-Wl', - '--fix-cortex-a8', ], }], [ 'skia_arch_type == "arm" and arm_thumb == 1', { |