wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved ALOGE and android_errorWriteLog calls under #ifdef __ANDROID__

Browse source 
am: c59cd5d

* commit 'c59cd5d2be':
  Moved ALOGE and android_errorWriteLog calls under #ifdef __ANDROID__

Change-Id: I67851b86c235192c72b834d0870d3a616c26eddf
This commit is contained in:
Harish Mahendrakar 2016-04-28 14:34:07 +00:00 • committed by android-build-merger
commit ea7d8393a9
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
decoder/ih264d_dpb_mgr.c
View file

@ -17,9 +17,10 @@
***************************************************************************** *****************************************************************************
* Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore * Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore
*/ */
#ifdef __ANDROID__
#include "log/log.h" #include "log/log.h"
#include <cutils/log.h> #include <cutils/log.h>
#endif
#include "ih264_typedefs.h" #include "ih264_typedefs.h"
#include "ih264_macros.h" #include "ih264_macros.h"
#include "ih264_platform_macros.h" #include "ih264_platform_macros.h"
@ -877,8 +878,10 @@ WORD32 ih264d_read_mmco_commands(struct _DecStruct * ps_dec)
{ {
if (j >= MAX_REF_BUFS) if (j >= MAX_REF_BUFS)
{ {
#ifdef __ANDROID__
ALOGE("b/25818142"); ALOGE("b/25818142");
android_errorWriteLog(0x534e4554, "25818142"); android_errorWriteLog(0x534e4554, "25818142");
#endif
ps_dpb_cmds->u1_num_of_commands = 0; ps_dpb_cmds->u1_num_of_commands = 0;
return -1; return -1;
} }

2
test/decoder.mk
View file

@ -9,5 +9,5 @@ LOCAL_CFLAGS := -DPROFILE_ENABLE -DARM -DMD5_DISABLE -fPIC
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../decoder $(LOCAL_PATH)/../common $(LOCAL_PATH)/decoder/ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../decoder $(LOCAL_PATH)/../common $(LOCAL_PATH)/decoder/
LOCAL_SRC_FILES := decoder/main.c LOCAL_SRC_FILES := decoder/main.c
LOCAL_STATIC_LIBRARIES := libavcdec LOCAL_STATIC_LIBRARIES := libavcdec
LOCAL_SHARED_LIBRARIES := liblog
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)