Commit 54289f1b authored by Vignesh Venkatasubramanian's avatar Vignesh Venkatasubramanian Committed by Frank Barchard

Fix mips build on android ndk r14+

Revert the workaround and fix it properly by passing the
additional necessary flag to the compiler.

BUG=libyuv:700

Change-Id: I1c893a8acb5079decbee6963b689424bf2f99f4f
Reviewed-on: https://chromium-review.googlesource.com/487881Reviewed-by: 's avatarFrank Barchard <fbarchard@google.com>
parent 3b583396
...@@ -47,6 +47,11 @@ LOCAL_SRC_FILES := \ ...@@ -47,6 +47,11 @@ LOCAL_SRC_FILES := \
source/video_common.cc source/video_common.cc
common_CFLAGS := -Wall -fexceptions common_CFLAGS := -Wall -fexceptions
# Mips builds on NDK r14+ require -no-integrated-as to properly compile inline
# assembly.
ifneq ($(findstring mips, $(TARGET_ARCH_ABI)),)
common_CFLAGS += -no-integrated-as
endif
ifneq ($(LIBYUV_DISABLE_JPEG), "yes") ifneq ($(LIBYUV_DISABLE_JPEG), "yes")
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \
source/convert_jpeg.cc \ source/convert_jpeg.cc \
......
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 1653 Version: 1654
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -357,8 +357,7 @@ extern "C" { ...@@ -357,8 +357,7 @@ extern "C" {
// The following are available on Mips platforms: // The following are available on Mips platforms:
#if !defined(LIBYUV_DISABLE_DSPR2) && defined(__mips__) && \ #if !defined(LIBYUV_DISABLE_DSPR2) && defined(__mips__) && \
(_MIPS_SIM == _MIPS_SIM_ABI32) && (__mips_isa_rev < 6) (_MIPS_SIM == _MIPS_SIM_ABI32) && (__mips_isa_rev < 6)
// TODO(fbarchard): fix CopyRow compile error - issue #700 #define HAS_COPYROW_MIPS
// #define HAS_COPYROW_MIPS
#if defined(__mips_dsp) && (__mips_dsp_rev >= 2) #if defined(__mips_dsp) && (__mips_dsp_rev >= 2)
#define HAS_I422TOARGBROW_DSPR2 #define HAS_I422TOARGBROW_DSPR2
#define HAS_INTERPOLATEROW_DSPR2 #define HAS_INTERPOLATEROW_DSPR2
......
...@@ -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 1653 #define LIBYUV_VERSION 1654
#endif // INCLUDE_LIBYUV_VERSION_H_ #endif // INCLUDE_LIBYUV_VERSION_H_
...@@ -19,7 +19,6 @@ extern "C" { ...@@ -19,7 +19,6 @@ extern "C" {
#if !defined(LIBYUV_DISABLE_DSPR2) && defined(__mips__) && \ #if !defined(LIBYUV_DISABLE_DSPR2) && defined(__mips__) && \
(_MIPS_SIM == _MIPS_SIM_ABI32) (_MIPS_SIM == _MIPS_SIM_ABI32)
// TODO(fbarchard): fix sgtu in CopyRow_MIPS for android sdk r14. bug/700
#ifdef HAS_COPYROW_MIPS #ifdef HAS_COPYROW_MIPS
void CopyRow_MIPS(const uint8* src, uint8* dst, int count) { void CopyRow_MIPS(const uint8* src, uint8* dst, int count) {
__asm__ __volatile__( __asm__ __volatile__(
......
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