diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-12-05 13:55:55 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-12-05 13:55:55 +0000 |
| commit | 44360bcca37888eae7913a903669fa5727d714eb (patch) | |
| tree | 36ac0d9833eea6fb58f37c073e069f92ef9db1f5 | |
| parent | ef843cdcd1be858fe55cc99ff134ffbd080c9a51 (diff) | |
Changes to the android gyp system to build without RTTI and exceptions.
Review URL: http://codereview.appspot.com/5437089
git-svn-id: http://skia.googlecode.com/svn/trunk@2794 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/common_conditions.gypi | 4 | ||||
| -rw-r--r-- | gyp/gpu.gyp | 1 | ||||
| -rw-r--r-- | gyp/libtess.gyp | 7 |
3 files changed, 11 insertions, 1 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 91d051fd18..12139f36cf 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -165,6 +165,10 @@ '-lm', '-llog', ], + 'cflags': [ + '-fno-exceptions', + '-fno-rtti', + ], 'conditions': [ [ 'skia_target_arch == "arm" and arm_thumb == 1', { 'cflags': [ diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index 0a7c4ee5e6..f0173f7aa2 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -339,7 +339,6 @@ 'libraries': [ '-lGLESv2', '-lEGL', - '-shared', ], }, }], diff --git a/gyp/libtess.gyp b/gyp/libtess.gyp index 4a776c3d9c..d74bcc74c3 100644 --- a/gyp/libtess.gyp +++ b/gyp/libtess.gyp @@ -41,6 +41,13 @@ '../third_party/glu', ], }, + 'conditions': [ + [ 'skia_os == "android"', { + 'cflags!': [ + '-fno-rtti', # supresses warnings about invalid option of non-C++ code + ], + }], + ], }, ], } |