diff options
Diffstat (limited to 'chromium/build/linux')
| -rwxr-xr-x | chromium/build/linux/python_arch.sh | 4 | ||||
| -rw-r--r-- | chromium/build/linux/system.gyp | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/chromium/build/linux/python_arch.sh b/chromium/build/linux/python_arch.sh index e0f63bc6b04..3a41f94a980 100755 --- a/chromium/build/linux/python_arch.sh +++ b/chromium/build/linux/python_arch.sh @@ -11,9 +11,7 @@ # file_out=$(file --dereference "$1") -# The POSIX spec says that `file` should not exit(1) if the file does not -# exist, so do our own -e check to catch things. -if [ $? -ne 0 ] || [ ! -e "$1" ] ; then +if [ $? -ne 0 ]; then echo unknown exit 0 fi diff --git a/chromium/build/linux/system.gyp b/chromium/build/linux/system.gyp index 9911317e2fb..4a7e857efc1 100644 --- a/chromium/build/linux/system.gyp +++ b/chromium/build/linux/system.gyp @@ -29,7 +29,7 @@ 'use_system_ssl%': 1, }, }], - [ 'chromeos==0 and use_qt==0', { + [ 'chromeos==0', { # Hide GTK and related dependencies for Chrome OS, so they won't get # added back to Chrome OS. Don't try to use GTK on Chrome OS. 'targets': [ @@ -506,8 +506,6 @@ { 'target_name': 'libpci', 'type': 'static_library', - 'conditions': [ - ['use_x11==1', { 'cflags': [ '<!@(<(pkg-config) --cflags libpci)', ], @@ -568,8 +566,6 @@ 'process_outputs_as_sources': 1, }, ], - }], - ], }, { 'target_name': 'libresolv', @@ -664,8 +660,6 @@ 'type': 'none', 'toolsets': ['host', 'target'], 'conditions': [ - ['use_pango==1', { - 'conditions': [ ['_toolset=="target"', { 'direct_dependent_settings': { 'cflags': [ @@ -696,8 +690,6 @@ }, }], ], - }], - ], }, { 'target_name': 'ssl', |