Commit bd108758 authored by Frank Barchard's avatar Frank Barchard

modified libyuv.gyp so that it no longer depends on libjpeg.gyp, which does not exist anymore.

BUG=libyuv:666
TESTED= unittests built and passed with jpeg disabled.
R=kjellander@chromium.org

Review-Url: https://codereview.chromium.org/2585373002 .
parent a899dea2
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 1637 Version: 1638
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ #ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1637 #define LIBYUV_VERSION 1638
#endif // INCLUDE_LIBYUV_VERSION_H_ #endif // INCLUDE_LIBYUV_VERSION_H_
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
}, },
'variables': { 'variables': {
'use_system_libjpeg%': 0, 'use_system_libjpeg%': 0,
'libyuv_disable_jpeg%': 0, # Can be enabled if your jpeg has GYP support.
'libyuv_disable_jpeg%': 1,
# 'chromium_code' treats libyuv as internal and increases warning level. # 'chromium_code' treats libyuv as internal and increases warning level.
'chromium_code': 1, 'chromium_code': 1,
# clang compiler default variable usable by other apps that include libyuv. # clang compiler default variable usable by other apps that include libyuv.
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
{ {
'variables': { 'variables': {
'libyuv_disable_jpeg%': 0, # Can be enabled if your jpeg has GYP support.
'libyuv_disable_jpeg%': 1,
'mips_msa%': 0, # Default to msa off. 'mips_msa%': 0, # Default to msa off.
}, },
'targets': [ 'targets': [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment