diff options
| author | Ying Wang <wangying@google.com> | 2013-04-09 21:55:39 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-04-09 21:55:39 -0700 |
| commit | 8a0cb4ee0b6c351de82987efb472fa38dfaf608a (patch) | |
| tree | de623d3de676510eb8b0e1fb69ec053e20a625cb /opengl | |
| parent | 1df59c93fea8bec21b8084c34aface086f1e0896 (diff) | |
| download | frameworks_native-8a0cb4ee0b6c351de82987efb472fa38dfaf608a.tar.gz frameworks_native-8a0cb4ee0b6c351de82987efb472fa38dfaf608a.tar.bz2 frameworks_native-8a0cb4ee0b6c351de82987efb472fa38dfaf608a.zip | |
Add liblog
Bug: 8580410
Change-Id: I2ca4fa00dde0b574df3619134836bcb9315bd506
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/libs/Android.mk | 6 | ||||
| -rw-r--r-- | opengl/libs/GLES_trace/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/gl2_jni/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/tests/gl_jni/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/tests/gl_perf/Android.mk | 3 | ||||
| -rw-r--r-- | opengl/tests/gl_perfapp/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/tests/gldual/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/tests/hwc/Android.mk | 4 |
9 files changed, 15 insertions, 6 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index 9b8d3fe4c..9886bf0f0 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -26,7 +26,7 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libagl\" LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -fvisibility=hidden -LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils libpixelflinger libETC1 libui +LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger libETC1 libui LOCAL_LDLIBS := -lpthread -ldl ifeq ($(TARGET_ARCH),arm) diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 581c4d49d..b4756dd43 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -32,7 +32,7 @@ LOCAL_SRC_FILES:= \ EGL/Loader.cpp \ # -LOCAL_SHARED_LIBRARIES += libcutils libutils libGLES_trace +LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libGLES_trace LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libEGL LOCAL_LDFLAGS += -Wl,--exclude-libs=ALL @@ -85,7 +85,7 @@ LOCAL_SRC_FILES:= \ GLES_CM/gl.cpp.arm \ # -LOCAL_SHARED_LIBRARIES += libcutils libEGL +LOCAL_SHARED_LIBRARIES += libcutils liblog libEGL LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libGLESv1_CM @@ -110,7 +110,7 @@ LOCAL_SRC_FILES:= \ GLES2/gl2.cpp.arm \ # -LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL +LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libEGL LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libGLESv2 diff --git a/opengl/libs/GLES_trace/Android.mk b/opengl/libs/GLES_trace/Android.mk index 9dec02009..846932dd3 100644 --- a/opengl/libs/GLES_trace/Android.mk +++ b/opengl/libs/GLES_trace/Android.mk @@ -22,7 +22,7 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI LOCAL_STATIC_LIBRARIES := libprotobuf-cpp-2.3.0-lite liblzf -LOCAL_SHARED_LIBRARIES := libcutils libutils libstlport +LOCAL_SHARED_LIBRARIES := libcutils libutils liblog libstlport LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\" diff --git a/opengl/tests/gl2_jni/Android.mk b/opengl/tests/gl2_jni/Android.mk index 25187c959..409bd734d 100644 --- a/opengl/tests/gl2_jni/Android.mk +++ b/opengl/tests/gl2_jni/Android.mk @@ -37,6 +37,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libutils \ + liblog \ libEGL \ libGLESv2 diff --git a/opengl/tests/gl_jni/Android.mk b/opengl/tests/gl_jni/Android.mk index 80b4bac65..11b4c8be9 100644 --- a/opengl/tests/gl_jni/Android.mk +++ b/opengl/tests/gl_jni/Android.mk @@ -37,6 +37,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libutils \ + liblog \ libEGL \ libGLESv1_CM diff --git a/opengl/tests/gl_perf/Android.mk b/opengl/tests/gl_perf/Android.mk index cfca089d5..b0f825c10 100644 --- a/opengl/tests/gl_perf/Android.mk +++ b/opengl/tests/gl_perf/Android.mk @@ -6,7 +6,8 @@ LOCAL_SRC_FILES:= \ filltest.cpp LOCAL_SHARED_LIBRARIES := \ - libcutils \ + libcutils \ + liblog \ libEGL \ libGLESv2 \ libui diff --git a/opengl/tests/gl_perfapp/Android.mk b/opengl/tests/gl_perfapp/Android.mk index 45a55169a..854b54ff9 100644 --- a/opengl/tests/gl_perfapp/Android.mk +++ b/opengl/tests/gl_perfapp/Android.mk @@ -40,6 +40,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libutils \ + liblog \ libEGL \ libGLESv2 diff --git a/opengl/tests/gldual/Android.mk b/opengl/tests/gldual/Android.mk index 42094c8a3..1991ed97a 100644 --- a/opengl/tests/gldual/Android.mk +++ b/opengl/tests/gldual/Android.mk @@ -37,6 +37,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libutils \ + liblog \ libEGL \ libGLESv2 diff --git a/opengl/tests/hwc/Android.mk b/opengl/tests/hwc/Android.mk index 177eb63ce..2fdfcf8f9 100644 --- a/opengl/tests/hwc/Android.mk +++ b/opengl/tests/hwc/Android.mk @@ -40,6 +40,7 @@ LOCAL_SHARED_LIBRARIES := \ libEGL \ libGLESv2 \ libutils \ + liblog \ libui \ libhardware \ @@ -72,6 +73,7 @@ LOCAL_SHARED_LIBRARIES := \ libEGL \ libGLESv2 \ libutils \ + liblog \ libui \ libhardware \ @@ -102,6 +104,7 @@ LOCAL_SHARED_LIBRARIES := \ libEGL \ libGLESv2 \ libutils \ + liblog \ libui \ libhardware \ @@ -132,6 +135,7 @@ LOCAL_SHARED_LIBRARIES := \ libEGL \ libGLESv2 \ libutils \ + liblog \ libui \ libhardware \ |