commit bca4262dac55cc59b28d6fde658d5f8a254fcc2d
author Jeff Davidson <jpd@google.com> Mon Jan 12 20:00:33 2015 +0000
committer Jeff Davidson <jpd@google.com> Mon Jan 12 20:00:33 2015 +0000
tree a25127f53b44663e497b0463e9511b711487d2c7
parent a42cdf169060e1bb65c77bc8a394d266403d8583

Revert "Update protobuf library from 2.3 to 2.6."

This reverts commit a42cdf169060e1bb65c77bc8a394d266403d8583.

Change-Id: I8f75e6fcc921041ebdfd35c4724134fcb2c739c6

opengl/libs/GLES_trace/Android.mk

diff --git a/opengl/libs/GLES_trace/Android.mk b/opengl/libs/GLES_trace/Android.mk
index 24c4be2..7af7f69 100644
--- a/opengl/libs/GLES_trace/Android.mk
+++ b/opengl/libs/GLES_trace/Android.mk
@@ -10,18 +10,18 @@
     src/gltrace_eglapi.cpp \
     src/gltrace_fixup.cpp \
     src/gltrace_hooks.cpp \
-    src/gltrace_transport.cpp \
-    $(call all-proto-files-under, proto)
+    src/gltrace.pb.cpp \
+    src/gltrace_transport.cpp
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH) \
     $(LOCAL_PATH)/../ \
-    external
+    external/protobuf/src \
+    external \
 
+LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
 LOCAL_STATIC_LIBRARIES := liblzf
-LOCAL_SHARED_LIBRARIES := libcutils libutils liblog
-
-LOCAL_PROTOC_OPTIMIZE_TYPE := lite
+LOCAL_SHARED_LIBRARIES := libcutils libutils liblog libprotobuf-cpp-lite
 
 LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\"