From 20794c4680dfec0716a6e4332d0ff84d955d4ff0 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Fri, 12 Apr 2013 07:30:25 +0000 Subject: [PATCH] android mk updated source list BUG=212 TEST=none Review URL: https://webrtc-codereview.appspot.com/1303007 git-svn-id: http://libyuv.googlecode.com/svn/trunk@661 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- Android.mk | 15 +++++++++------ README.chromium | 2 +- include/libyuv/version.h | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Android.mk b/Android.mk index 62922f054..c6f9f28b5 100644 --- a/Android.mk +++ b/Android.mk @@ -13,11 +13,14 @@ LOCAL_SRC_FILES := \ source/convert_argb.cc \ source/convert_from.cc \ source/convert_from_argb.cc \ + source/convert_to_argb.cc \ + source/convert_to_i420.cc \ source/cpu_id.cc \ source/format_conversion.cc \ source/planar_functions.cc \ source/rotate.cc \ source/rotate_argb.cc \ + source/rotate_mips.cc \ source/row_any.cc \ source/row_common.cc \ source/row_mips.cc \ @@ -25,7 +28,7 @@ LOCAL_SRC_FILES := \ source/scale.cc \ source/scale_argb.cc \ source/scale_mips.cc \ - source/video_common.cc \ + source/video_common.cc # TODO(fbarchard): Enable mjpeg encoder. # source/mjpeg_decoder.cc @@ -33,11 +36,11 @@ LOCAL_SRC_FILES := \ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) LOCAL_CFLAGS += -DLIBYUV_NEON LOCAL_SRC_FILES += \ - source/compare_neon.cc.neon \ - source/rotate_neon.cc.neon \ - source/row_neon.cc.neon \ - source/scale_argb_neon.cc.neon \ - source/scale_neon.cc.neon + source/compare_neon.cc.neon \ + source/rotate_neon.cc.neon \ + source/row_neon.cc.neon \ + source/scale_argb_neon.cc.neon \ + source/scale_neon.cc.neon endif LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include diff --git a/README.chromium b/README.chromium index 5cd5f95ea..5fbff99bf 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 660 +Version: 661 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 9670bea3e..5c41eb44a 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 660 +#define LIBYUV_VERSION 661 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT