diff options
| author | Ying Wang <wangying@google.com> | 2014-05-07 23:01:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 23:01:19 +0000 |
| commit | 114d71ce7c6ec1ce0327c812a42966c4258b4a46 (patch) | |
| tree | edf73973c50f6a4ecb47e562a5c3e749e3632062 /opengl | |
| parent | 9fdfa60aaf477cc944013b637a2a35d357d4340f (diff) | |
| parent | 214b4a61ac3fa63e35c79157d3acf0d8b692b3ac (diff) | |
| download | frameworks_native-114d71ce7c6ec1ce0327c812a42966c4258b4a46.zip frameworks_native-114d71ce7c6ec1ce0327c812a42966c4258b4a46.tar.gz frameworks_native-114d71ce7c6ec1ce0327c812a42966c4258b4a46.tar.bz2 | |
am 214b4a61: am 8155ce81: Merge "Remove unused LOCAL_LDLIBS."
* commit '214b4a61ac3fa63e35c79157d3acf0d8b692b3ac':
Remove unused LOCAL_LDLIBS.
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/libs/Android.mk | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index 32bc5d9..64320cf 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -27,7 +27,6 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -fvisibility=hidden LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger libETC1 libui -LOCAL_LDLIBS := -lpthread -ldl LOCAL_SRC_FILES_arm += fixed_asm.S iterators.S LOCAL_CFLAGS_arm += -fstrict-aliasing diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 7328a1d..35feb61 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -33,7 +33,6 @@ LOCAL_SRC_FILES:= \ # LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libGLES_trace -LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libEGL LOCAL_LDFLAGS += -Wl,--exclude-libs=ALL LOCAL_SHARED_LIBRARIES += libdl @@ -79,7 +78,6 @@ LOCAL_SRC_FILES:= \ # LOCAL_SHARED_LIBRARIES += libcutils liblog libEGL -LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libGLESv1_CM LOCAL_SHARED_LIBRARIES += libdl @@ -104,7 +102,6 @@ LOCAL_SRC_FILES:= \ # LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libEGL -LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libGLESv2 LOCAL_SHARED_LIBRARIES += libdl @@ -141,7 +138,6 @@ LOCAL_SRC_FILES:= \ ETC1/etc1.cpp \ # -LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libETC1 include $(BUILD_HOST_STATIC_LIBRARY) @@ -156,7 +152,6 @@ LOCAL_SRC_FILES:= \ ETC1/etc1.cpp \ # -LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libETC1 include $(BUILD_SHARED_LIBRARY) |