Revert "Update protobuf library from 2.3 to 2.6."

This reverts commit a42cdf1690.

Change-Id: I8f75e6fcc921041ebdfd35c4724134fcb2c739c6

opengl/libs/GLES_trace/Android.mk

@@ -10,18 +10,18 @@ LOCAL_SRC_FILES := \
     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\"
 

opengl/libs/GLES_trace/dev.make

@@ -1,6 +1,11 @@
 ## NOTE
 ## This file is used for development purposes only. It is not used by the build system.
 
+# generate protocol buffer files
+genproto: gltrace.proto
+	aprotoc --cpp_out=src --java_out=java gltrace.proto
+	mv src/gltrace.pb.cc src/gltrace.pb.cpp
+
 sync:
 	adb root
 	adb remount

opengl/libs/GLES_trace/gltrace.proto

@@ -23,8 +23,6 @@ option java_outer_classname = "GLProtoBuf";
 
 message GLMessage {
     enum Function {
-        option allow_alias = true;
-
         glActiveTexture = 0;
         glAlphaFunc = 1;
         glAlphaFuncx = 2;

opengl/libs/GLES_trace/src/gltrace_api.cpp

@@ -19,7 +19,7 @@
 #include <cutils/log.h>
 #include <utils/Timers.h>
 
-#include "frameworks/native/opengl/libs/GLES_trace/proto/gltrace.pb.h"
+#include "gltrace.pb.h"
 #include "gltrace_context.h"
 #include "gltrace_fixup.h"
 #include "gltrace_transport.h"

opengl/libs/GLES_trace/src/gltrace_egl.cpp

@@ -17,7 +17,7 @@
 #include <cutils/log.h>
 #include <utils/Timers.h>
 
-#include "frameworks/native/opengl/libs/GLES_trace/proto/gltrace.pb.h"
+#include "gltrace.pb.h"
 #include "gltrace_context.h"
 #include "gltrace_fixup.h"
 #include "gltrace_transport.h"

opengl/libs/GLES_trace/src/gltrace_fixup.cpp

@@ -21,7 +21,7 @@
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
-#include "frameworks/native/opengl/libs/GLES_trace/proto/gltrace.pb.h"
+#include "gltrace.pb.h"
 #include "gltrace_api.h"
 #include "gltrace_context.h"
 #include "gltrace_fixup.h"

opengl/libs/GLES_trace/src/gltrace_fixup.h

@@ -19,7 +19,7 @@
 
 #include <utils/Timers.h>
 
-#include "frameworks/native/opengl/libs/GLES_trace/proto/gltrace.pb.h"
+#include "gltrace.pb.h"
 #include "gltrace_context.h"
 
 namespace android {

opengl/libs/GLES_trace/src/gltrace_transport.h

@@ -19,7 +19,7 @@
 
 #include <pthread.h>
 
-#include "frameworks/native/opengl/libs/GLES_trace/proto/gltrace.pb.h"
+#include "gltrace.pb.h"
 
 namespace android {
 namespace gltrace {