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

Commit 83f14309 authored by Jeff Davidson's avatar Jeff Davidson Committed by Gerrit Code Review
Browse files

Merge "Revert "Update protobuf library from 2.3 to 2.6.""

parents 9200d4e3 bca4262d
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_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 −0
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
+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ option java_outer_classname = "GLProtoBuf";

message GLMessage {
    enum Function {
        option allow_alias = true;

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

File added.

Preview size limit exceeded, changes collapsed.

+2525 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading