Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a42cdf16 authored by Jeff Davidson's avatar Jeff Davidson
Browse files

Update protobuf library from 2.3 to 2.6.

Remove generated cpp/h files for gltrace.proto as we can use the build
system to generate these dynamically.

Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
parent 96e4409e
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -10,18 +10,18 @@ LOCAL_SRC_FILES := \
    src/gltrace_eglapi.cpp \
    src/gltrace_fixup.cpp \
    src/gltrace_hooks.cpp \
    src/gltrace.pb.cpp \
    src/gltrace_transport.cpp
    src/gltrace_transport.cpp \
    $(call all-proto-files-under, proto)

LOCAL_C_INCLUDES := \
    $(LOCAL_PATH) \
    $(LOCAL_PATH)/../ \
    external/protobuf/src \
    external \
    external

LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
LOCAL_STATIC_LIBRARIES := liblzf
LOCAL_SHARED_LIBRARIES := libcutils libutils liblog libprotobuf-cpp-lite
LOCAL_SHARED_LIBRARIES := libcutils libutils liblog

LOCAL_PROTOC_OPTIMIZE_TYPE := lite

LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\"

+0 −5
Original line number Diff line number Diff line
## 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 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ option java_outer_classname = "GLProtoBuf";

message GLMessage {
    enum Function {
        option allow_alias = true;

        glActiveTexture = 0;
        glAlphaFunc = 1;
        glAlphaFuncx = 2;
+0 −2715

File deleted.

Preview size limit exceeded, changes collapsed.

+0 −2525

File deleted.

Preview size limit exceeded, changes collapsed.

Loading