aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2016-09-30 23:03:13 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-30 23:03:13 +0000
commit68d39939cea6922473bce4912c5cf9bba250ca47 (patch)
tree0ae3d87afd4d64879b68658bdab7779c943af0b0
parent3c2112407b7474846ea01b35e0b89c3ab6eeb86d (diff)
parent238de9f05adaaced3efadc36039b1c9ab9fa75a6 (diff)
downloadomx-components-68d39939cea6922473bce4912c5cf9bba250ca47.tar.gz
build breakage: LOG_TAG redefinition am: 7f6133ff56 am: 076d30f191android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1o-preview
am: 238de9f05a Change-Id: I18decf60b77e8324d5707f6f4f7d48f8e4e8a85e
-rw-r--r--videocodec/libvpx_internal/x86/trace_conf.h4
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