diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-02-27 17:47:14 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-03-11 18:03:08 +0100 |
| commit | 829f46fdcd3136e2b97c310538cb27881ff3733b (patch) | |
| tree | 1cfb62caec8f10a683d9ccdb5cabb795be6088ea /emulator/opengl/shared | |
| parent | c26879632b8ed3e91c7e5e9e9650d2412835e849 (diff) | |
| download | sdk-829f46fdcd3136e2b97c310538cb27881ff3733b.zip sdk-829f46fdcd3136e2b97c310538cb27881ff3733b.tar.gz sdk-829f46fdcd3136e2b97c310538cb27881ff3733b.tar.bz2 | |
emulator/opengl: Remove libcutils/libutils/liblog
Final patch to completely remove dependencies on
libcutils/libutils/liblog from the host-side GPU
emulation libraries.
Change-Id: I84a058bbd0ca676b18c0b0a094ac8bae692f9c94
Diffstat (limited to 'emulator/opengl/shared')
| -rw-r--r-- | emulator/opengl/shared/OpenglCodecCommon/Android.mk | 2 | ||||
| -rw-r--r-- | emulator/opengl/shared/OpenglCodecCommon/ErrorLog.h | 22 |
2 files changed, 6 insertions, 18 deletions
diff --git a/emulator/opengl/shared/OpenglCodecCommon/Android.mk b/emulator/opengl/shared/OpenglCodecCommon/Android.mk index 5deb1f7..f285f6a 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/Android.mk +++ b/emulator/opengl/shared/OpenglCodecCommon/Android.mk @@ -25,7 +25,6 @@ $(call emugl-begin-host-static-library,libOpenglCodecCommon) LOCAL_SRC_FILES := $(host_commonSources) -$(call emugl-export,STATIC_LIBRARIES,libcutils) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) $(call emugl-end-module) @@ -35,7 +34,6 @@ $(call emugl-begin-host-static-library,lib64OpenglCodecCommon) LOCAL_SRC_FILES := $(host_commonSources) -$(call emugl-export,STATIC_LIBRARIES,lib64cutils) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) $(call emugl-export,CFLAGS,-m64) $(call emugl-end-module) diff --git a/emulator/opengl/shared/OpenglCodecCommon/ErrorLog.h b/emulator/opengl/shared/OpenglCodecCommon/ErrorLog.h index 43577d4..4cad61f 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/ErrorLog.h +++ b/emulator/opengl/shared/OpenglCodecCommon/ErrorLog.h @@ -16,22 +16,12 @@ #ifndef _ERROR_LOG_H_ #define _ERROR_LOG_H_ -#ifdef __ANDROID__ -# include <cutils/log.h> -# define ERR(...) ALOGE(__VA_ARGS__) -# ifdef EMUGL_DEBUG -# define DBG(...) ALOGD(__VA_ARGS__) -# else -# define DBG(...) ((void)0) -# endif +#include <stdio.h> +#define ERR(...) fprintf(stderr, __VA_ARGS__) +#ifdef EMUGL_DEBUG +# define DBG(...) fprintf(stderr, __VA_ARGS__) #else -# include <stdio.h> -# define ERR(...) fprintf(stderr, __VA_ARGS__) -# ifdef EMUGL_DEBUG -# define DBG(...) fprintf(stderr, __VA_ARGS__) -# else -# define DBG(...) ((void)0) -# endif +# define DBG(...) ((void)0) #endif -#endif +#endif // _ERROR_LOG_H_ |