commit 3db8bb9d44eef64553a88fdc2698ef3b593c49c7
author Austin Hu <austin.hu@intel.com> Thu Oct 20 16:40:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 20 16:40:50 2016 +0000
tree 38e9cac422296cef855c6dc14b0ffd9bebc30b4c
parent 68d39939cea6922473bce4912c5cf9bba250ca47
parent c0f2dd551d0445783010b6c70d9bf5ec4cdc10a9

Handle the skip decoding case. am: c98025c07f
am: c0f2dd551d

Change-Id: Ia9756e1ba5ceccae062e8963907ff8e139b19450

videocodec/libvpx_internal/libvpx.mk

diff --git a/videocodec/libvpx_internal/libvpx.mk b/videocodec/libvpx_internal/libvpx.mk
index 5a95803..a23cc26 100644
--- a/videocodec/libvpx_internal/libvpx.mk
+++ b/videocodec/libvpx_internal/libvpx.mk
@@ -40,7 +40,6 @@
 libvpx_codec_srcs := $(shell cat $(libvpx_config_dir)/libvpx_srcs.txt)
 
 LOCAL_SHARED_LIBRARIES += liblog
-LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog
 LOCAL_CFLAGS := -DHAVE_CONFIG_H=vpx_config.h
 
 # Static functions declared in headers. b/18632512

videocodec/libvpx_internal/x86/trace_conf.h

diff --git a/videocodec/libvpx_internal/x86/trace_conf.h b/videocodec/libvpx_internal/x86/trace_conf.h
index b410dbf..f204647 100644
--- a/videocodec/libvpx_internal/x86/trace_conf.h
+++ b/videocodec/libvpx_internal/x86/trace_conf.h
@@ -1,9 +1,9 @@
 #ifndef TRACE_CONF_H
 #define TRACE_CONF_H
 
-#include <android/log.h>
-
 #define LOG_TAG "libvpx"
 #define LOGD(fmt_str, ...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, "[%s:%d] "fmt_str, __FUNCTION__, __LINE__, ##__VA_ARGS__)
 
+#include <android/log.h>
+
 #endif