Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Unified Diff: libjpeg.gyp

Issue 8836008: Use os_posix in gyp file, this patch was tested on Solaris, NetBSD, and OpenBSD. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libjpeg_turbo/
Patch Set: '' Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libjpeg.gyp
===================================================================
--- libjpeg.gyp (revision 111873)
+++ libjpeg.gyp (working copy)
@@ -6,11 +6,13 @@
'variables': {
'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turbo',
'conditions': [
- [ 'chromeos==1 or OS=="freebsd" or OS=="openbsd"', {
+ [ 'chromeos == 1 or (os_posix == 1 and \
+ OS != "mac" and OS != "linux" and OS != "android")', {
# Link to system .so since we already use it due to GTK.
# See crbug.com/30288 and 31427 for why we skip OS=="linux" above.
'use_system_libjpeg%': 1,
- }, { # chromeos!=1 and OS!="freebsd" and OS!="openbsd"
+ }, { # chromeos != 1 and (os_posix != 1 or
+ # OS == "mac" or OS == "linux" or OS == "android")
'use_system_libjpeg%': 0,
}],
[ 'OS=="win"', {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698