From 6d72063cfd28ab4e5ed9d3405c7e9389d8e78bad Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Sat, 15 Nov 2014 18:18:17 -0800 Subject: Move frameworks/native to libc++. I'm pretty sure I had done this before... Must have been new dependencies that slipped in when L merged in. Bug: 15193147 Change-Id: Ib9b1b8a65665d25c33c6141b9476a8e13c4084e0 --- opengl/libs/GLES_trace/Android.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'opengl') 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) -- cgit v1.1