ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6."" 

* commit '83f14309f17af398ec8ff7f82d9b2f010ea7cd5f':
  Revert "Update protobuf library from 2.3 to 2.6."
This commit is contained in:
Jeff Davidson 2015-01-12 20:10:05 +00:00 committed by Android Git Automerger
parent 7581a96bfd 83f14309f1
commit eb329c07c1
10 changed files with 5256 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opengl/libs/GLES_trace/Android.mk
View File

@ -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\"

5
opengl/libs/GLES_trace/dev.make
View File

@ -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

2
opengl/libs/GLES_trace/proto/gltrace.proto → opengl/libs/GLES_trace/gltrace.proto
View File

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

2715
opengl/libs/GLES_trace/src/gltrace.pb.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

2525
opengl/libs/GLES_trace/src/gltrace.pb.h Normal file
View File

File diff suppressed because it is too large Load Diff

2
opengl/libs/GLES_trace/src/gltrace_api.cpp
View File

@ -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"

2
opengl/libs/GLES_trace/src/gltrace_egl.cpp
View File

@ -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"

2
opengl/libs/GLES_trace/src/gltrace_fixup.cpp
View File

@ -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"

2
opengl/libs/GLES_trace/src/gltrace_fixup.h
View File

@ -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 {

2
opengl/libs/GLES_trace/src/gltrace_transport.h
View File

@ -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 {