diff options
| author | Mathias Agopian <mathias@google.com> | 2009-06-03 18:26:58 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-06-03 18:26:58 -0700 |
| commit | b4b4c11f82e88f9a1cecd97460a9fcc192b37612 (patch) | |
| tree | bd1c266012b39e4f6c7e0c961d20842d6f1ee1e9 /opengl | |
| parent | a650aaa3918f47ceb116ce8dfd3f1e423687fa69 (diff) | |
| download | frameworks_base-b4b4c11f82e88f9a1cecd97460a9fcc192b37612.zip frameworks_base-b4b4c11f82e88f9a1cecd97460a9fcc192b37612.tar.gz frameworks_base-b4b4c11f82e88f9a1cecd97460a9fcc192b37612.tar.bz2 | |
fix/clean these Android.mk following dbort and joeo's comments
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/Android.mk | 5 | ||||
| -rw-r--r-- | opengl/libs/Android.mk | 12 | ||||
| -rw-r--r-- | opengl/libs/EGL/Loader.cpp | 6 |
3 files changed, 11 insertions, 12 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index 060f3c6..d1ed82e 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -32,12 +32,13 @@ endif ifneq ($(TARGET_SIMULATOR),true) # we need to access the private Bionic header <bionic_tls.h> - LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private + LOCAL_C_INCLUDES += bionic/libc/private endif ifeq ($(LIBAGL_USE_GRALLOC_COPYBITS),1) - LOCAL_CFLAGS += -DLIBAGL_USE_GRALLOC_COPYBITS -I$(LOCAL_PATH)/../../../../hardware/libhardware/modules/gralloc + LOCAL_CFLAGS += -DLIBAGL_USE_GRALLOC_COPYBITS LOCAL_SRC_FILES += copybit.cpp + LOCAL_C_INCLUDES += hardware/libhardware/modules/gralloc endif LOCAL_CFLAGS += -DLOG_TAG=\"libagl\" diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 33a1698..e1fd48b 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -20,8 +20,8 @@ LOCAL_MODULE:= libEGL ifeq ($(TARGET_SIMULATOR),true) else LOCAL_SHARED_LIBRARIES += libdl - # we need to access the Bionic private header <bionic_tls.h> - LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private + # we need to access the private Bionic header <bionic_tls.h> + LOCAL_C_INCLUDES += bionic/libc/private endif LOCAL_CFLAGS += -DLOG_TAG=\"libEGL\" @@ -66,8 +66,8 @@ LOCAL_MODULE:= libGLESv1_CM ifeq ($(TARGET_SIMULATOR),true) else LOCAL_SHARED_LIBRARIES += libdl - # we need to access the Bionic private header <bionic_tls.h> - LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private + # we need to access the private Bionic header <bionic_tls.h> + LOCAL_C_INCLUDES += bionic/libc/private endif LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv1\" @@ -95,8 +95,8 @@ LOCAL_MODULE:= libGLESv2 ifeq ($(TARGET_SIMULATOR),true) else LOCAL_SHARED_LIBRARIES += libdl - # we need to access the Bionic private header <bionic_tls.h> - LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private + # we need to access the private Bionic header <bionic_tls.h> + LOCAL_C_INCLUDES += bionic/libc/private endif LOCAL_CFLAGS += -DLOG_TAG=\"libGLESv2\" diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp index 0e0f2c2..103522e 100644 --- a/opengl/libs/EGL/Loader.cpp +++ b/opengl/libs/EGL/Loader.cpp @@ -165,7 +165,7 @@ void* Loader::open(EGLNativeDisplayType display, int impl, gl_hooks_t* hooks) } LOG_FATAL_IF(!index && !impl && !hnd, - "couldn't't find the default OpenGL ES implementation " + "couldn't find the default OpenGL ES implementation " "for default display"); return (void*)hnd; @@ -226,9 +226,7 @@ void *Loader::load_driver(const char* driver, gl_hooks_t* hooks, uint32_t mask) { //LOGD("%s", driver); void* dso = dlopen(driver, RTLD_NOW | RTLD_LOCAL); - LOGE_IF(!dso, - "couldn't load <%s> library (%s)", - driver, dlerror()); + LOGE_IF(!dso, "%s", dlerror()); if (dso == 0) return 0; |