aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangxianzhu@chromium.org <wangxianzhu@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2013-12-09 23:01:52 +0000
committerwangxianzhu@chromium.org <wangxianzhu@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2013-12-09 23:01:52 +0000
commite81fceb30c7cc407b0dcb3e44c4e518fc14bae61 (patch)
tree5ec374e5f984ccc1a140c4d6d636a590cfba621b
parent9652949c7866f976393848990dbebbd873f5f43f (diff)
downloadlibjpeg_turbo-e81fceb30c7cc407b0dcb3e44c4e518fc14bae61.tar.gz
Temporary limit NO_GETENV on Android only
This is for rolling the NO_GETENV change on Android only into m32. Will revert this change immediately after this change is submitted. BUG=322228 R=klobag@chromium.org Review URL: https://codereview.chromium.org/110163003 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@239583 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
-rw-r--r--libjpeg.gyp6
1 files changed, 5 insertions, 1 deletions
diff --git a/libjpeg.gyp b/libjpeg.gyp
index 03dc537..39d5ce5 100644
--- a/libjpeg.gyp
+++ b/libjpeg.gyp
@@ -25,7 +25,6 @@
'defines': [
'WITH_SIMD',
'MOTION_JPEG_SUPPORTED',
- 'NO_GETENV',
],
'sources': [
'jcapimin.c',
@@ -266,6 +265,11 @@
],
},
}],
+ [ 'OS=="android"', {
+ 'defines': [
+ 'NO_GETENV', # getenv() is not thread-safe.
+ ],
+ }],
],
'rules': [
{