From 145998b64e618e4a38906e63c47d50014fc4bb44 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Thu, 23 Feb 2012 04:03:15 +0000 Subject: [PATCH] make libyuv library depend on libjpeg BUG=none TEST=none Review URL: https://webrtc-codereview.appspot.com/405001 git-svn-id: http://libyuv.googlecode.com/svn/trunk@186 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- DEPS | 1 + libyuv.gyp | 3 +++ libyuv_test.gyp | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 7e86be954..4c2263c5d 100644 --- a/DEPS +++ b/DEPS @@ -33,6 +33,7 @@ deps = { "trunk/third_party/yasm/": Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"), + # TODO(fbarchard): Review yasm dependency "trunk/third_party/yasm/source/patched-yasm": Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@73761", diff --git a/libyuv.gyp b/libyuv.gyp index f651212ee..db80c9038 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -11,6 +11,9 @@ { 'target_name': 'libyuv', 'type': 'static_library', + 'dependencies': [ + 'third_party/libjpeg_turbo/libjpeg.gyp:libjpeg', + ], 'defines': [ 'HAVE_JPEG', ], diff --git a/libyuv_test.gyp b/libyuv_test.gyp index 78c920a54..52e11fdc1 100644 --- a/libyuv_test.gyp +++ b/libyuv_test.gyp @@ -16,7 +16,6 @@ # The tests are based on gtest 'testing/gtest.gyp:gtest', 'testing/gtest.gyp:gtest_main', - 'third_party/libjpeg_turbo/libjpeg.gyp:libjpeg', ], 'sources': [ # headers