diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-16 17:23:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-16 17:23:12 +0000 |
| commit | d72ff140e0df44106cd8539396ce686aa8f3306a (patch) | |
| tree | 929de4ed7e2268e37bfbeb8e6bd714637d57af29 /opengl | |
| parent | 11bf9e5c2f90101d56d918e1b3fe780b873e5566 (diff) | |
| parent | 6d72063cfd28ab4e5ed9d3405c7e9389d8e78bad (diff) | |
| download | frameworks_native-d72ff140e0df44106cd8539396ce686aa8f3306a.zip frameworks_native-d72ff140e0df44106cd8539396ce686aa8f3306a.tar.gz frameworks_native-d72ff140e0df44106cd8539396ce686aa8f3306a.tar.bz2 | |
Merge "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) |