From c904bd7933e5a5893a6004fabadc12efde575850 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Thu, 21 Nov 2013 19:57:10 +0000 Subject: [PATCH] Android support To use the Chromium toolchain out-of-the-box, it seems like an All target is needed by default. To compile using the Android tools: 1. add ;target_os=['android'] to your .gclient 2. gclient sync --nohooks 3. from your trunk dir, run: source build/android/envsetup.sh 4. gclient runhooks 5. ninja -C out/Release BUG=libyuv:288 R=wuwang@google.com Review URL: https://webrtc-codereview.appspot.com/4119007 git-svn-id: http://libyuv.googlecode.com/svn/trunk@873 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- all.gyp | 21 +++++++++++++++++++++ include/libyuv/version.h | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 all.gyp diff --git a/README.chromium b/README.chromium index ec233eeb6..94a51b37d 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 871 +Version: 873 License: BSD License File: LICENSE diff --git a/all.gyp b/all.gyp new file mode 100644 index 000000000..88a748427 --- /dev/null +++ b/all.gyp @@ -0,0 +1,21 @@ +# Copyright 2013 The LibYuv Project Authors. All rights reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +# all.gyp and All target are for benefit of android gyp build. +{ + 'targets': [ + { + 'target_name': 'All', + 'type': 'none', + 'dependencies': [ + 'libyuv.gyp:*', + 'libyuv_test.gyp:*', + ], + }, + ], +} diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 39712afcb..9ee12307e 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 871 +#define LIBYUV_VERSION 873 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT