diff options
author | Mark Salyzyn <salyzyn@google.com> | 2016-09-30 15:36:39 -0700 |
---|---|---|
committer | Mark Salyzyn <salyzyn@google.com> | 2016-09-30 15:41:18 -0700 |
commit | 7f6133ff56bd48a9afd19aac2575c6f687f1d00a (patch) | |
tree | 0ae3d87afd4d64879b68658bdab7779c943af0b0 | |
parent | 86dfb1579d8183eb96015242480e5a4ec0814ead (diff) | |
download | omx-components-7f6133ff56bd48a9afd19aac2575c6f687f1d00a.tar.gz |
build breakage: LOG_TAG redefinitionandroid-n-mr1-preview-2android-n-mr1-preview-1
Test: aosp_fugu build fixed
Bug: 26552300
Bug: 31289077
Change-Id: I5a3bb998b9274c734bc745f66ef625f63ff51c96
-rw-r--r-- | videocodec/libvpx_internal/x86/trace_conf.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |