Commit 20794c46 authored by fbarchard@google.com's avatar fbarchard@google.com

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
parent c297d103
...@@ -13,11 +13,14 @@ LOCAL_SRC_FILES := \ ...@@ -13,11 +13,14 @@ LOCAL_SRC_FILES := \
source/convert_argb.cc \ source/convert_argb.cc \
source/convert_from.cc \ source/convert_from.cc \
source/convert_from_argb.cc \ source/convert_from_argb.cc \
source/convert_to_argb.cc \
source/convert_to_i420.cc \
source/cpu_id.cc \ source/cpu_id.cc \
source/format_conversion.cc \ source/format_conversion.cc \
source/planar_functions.cc \ source/planar_functions.cc \
source/rotate.cc \ source/rotate.cc \
source/rotate_argb.cc \ source/rotate_argb.cc \
source/rotate_mips.cc \
source/row_any.cc \ source/row_any.cc \
source/row_common.cc \ source/row_common.cc \
source/row_mips.cc \ source/row_mips.cc \
...@@ -25,7 +28,7 @@ LOCAL_SRC_FILES := \ ...@@ -25,7 +28,7 @@ LOCAL_SRC_FILES := \
source/scale.cc \ source/scale.cc \
source/scale_argb.cc \ source/scale_argb.cc \
source/scale_mips.cc \ source/scale_mips.cc \
source/video_common.cc \ source/video_common.cc
# TODO(fbarchard): Enable mjpeg encoder. # TODO(fbarchard): Enable mjpeg encoder.
# source/mjpeg_decoder.cc # source/mjpeg_decoder.cc
...@@ -33,11 +36,11 @@ LOCAL_SRC_FILES := \ ...@@ -33,11 +36,11 @@ LOCAL_SRC_FILES := \
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_CFLAGS += -DLIBYUV_NEON LOCAL_CFLAGS += -DLIBYUV_NEON
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \
source/compare_neon.cc.neon \ source/compare_neon.cc.neon \
source/rotate_neon.cc.neon \ source/rotate_neon.cc.neon \
source/row_neon.cc.neon \ source/row_neon.cc.neon \
source/scale_argb_neon.cc.neon \ source/scale_argb_neon.cc.neon \
source/scale_neon.cc.neon source/scale_neon.cc.neon
endif endif
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
......
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 660 Version: 661
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 660 #define LIBYUV_VERSION 661
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
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