diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-16 17:31:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-16 17:31:57 +0000 |
| commit | 36ec7a8b99e287d923bfacd2ef69661818aeb85e (patch) | |
| tree | e60254b47c608f3e683ebb8c2803c3ff271277fa /opengl | |
| parent | 3fd6b2b912037a7cca8d2591dfa8f9a83d0e46e7 (diff) | |
| parent | d72ff140e0df44106cd8539396ce686aa8f3306a (diff) | |
| download | frameworks_native-36ec7a8b99e287d923bfacd2ef69661818aeb85e.zip frameworks_native-36ec7a8b99e287d923bfacd2ef69661818aeb85e.tar.gz frameworks_native-36ec7a8b99e287d923bfacd2ef69661818aeb85e.tar.bz2 | |
am d72ff140: Merge "Move frameworks/native to libc++."
* commit 'd72ff140e0df44106cd8539396ce686aa8f3306a':
Move frameworks/native to libc++.
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/GLES_trace/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/opengl/libs/GLES_trace/Android.mk b/opengl/libs/GLES_trace/Android.mk index d74f77a..7af7f69 100644 --- a/opengl/libs/GLES_trace/Android.mk +++ b/opengl/libs/GLES_trace/Android.mk @@ -20,8 +20,8 @@ LOCAL_C_INCLUDES := \ external \ LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI -LOCAL_STATIC_LIBRARIES := libprotobuf-cpp-2.3.0-lite liblzf -LOCAL_SHARED_LIBRARIES := libcutils libutils liblog +LOCAL_STATIC_LIBRARIES := liblzf +LOCAL_SHARED_LIBRARIES := libcutils libutils liblog libprotobuf-cpp-lite LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\" @@ -31,5 +31,4 @@ LOCAL_C_INCLUDES += bionic/libc/private LOCAL_MODULE:= libGLES_trace LOCAL_MODULE_TAGS := optional -include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) |