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

Commit 64606bd5 authored by Jeff Davidson's avatar Jeff Davidson Committed by Gerrit Code Review
Browse files

Merge "Update protobuf library from 2.3 to 2.6."

parents 5f31338c b1055a19

core/binary.mk

+0 −10
Original line number Diff line number Diff line
@@ -533,22 +533,12 @@ $(proto_generated_objects): $(proto_generated_obj_dir)/%.o: $(proto_generated_cc 
my_c_includes += external/protobuf/src $(proto_generated_cc_sources_dir)

my_cflags += -DGOOGLE_PROTOBUF_NO_RTTI

ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full)

    ifneq ($(filter libprotobuf-cpp-2.3.0-full,$(my_static_libraries)),)

        $(warning Stripping unneeded dependency on libprotobuf-cpp-2.3.0-full in $(LOCAL_MODULE))

        my_static_libraries := $(filter-out libprotobuf-cpp-2.3.0-full,$(my_static_libraries))

    endif



    ifdef LOCAL_SDK_VERSION

        my_static_libraries += libprotobuf-cpp-full

    else

        my_shared_libraries += libprotobuf-cpp-full

    endif

else

    ifneq ($(filter libprotobuf-cpp-2.3.0-lite,$(my_static_libraries)),)

        $(warning Stripping unneeded dependency on libprotobuf-cpp-2.3.0-lite in $(LOCAL_MODULE))

        my_static_libraries := $(filter-out libprotobuf-cpp-2.3.0-lite,$(my_static_libraries))

    endif



    ifdef LOCAL_SDK_VERSION

        my_static_libraries += libprotobuf-cpp-lite

    else

core/host_java_library_common.mk

+0 −12
Original line number Diff line number Diff line
@@ -29,23 +29,11 @@ all_res_assets := 
proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))

ifneq ($(proto_sources),)

ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)

    ifneq ($(filter host-libprotobuf-java-2.3.0-micro,$(LOCAL_JAVA_LIBRARIES)),)

        $(warning Stripping unneeded dependency on host-libprotobuf-java-2.3.0-micro in $(LOCAL_MODULE))

        LOCAL_JAVA_LIBRARIES := $(filter-out host-libprotobuf-java-2.3.0-micro,$(LOCAL_JAVA_LIBRARIES))

    endif

    LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-micro

else

  ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)

    ifneq ($(filter host-libprotobuf-java-2.3.0-nano,$(LOCAL_JAVA_LIBRARIES)),)

        $(warning Stripping unneeded dependency on host-libprotobuf-java-2.3.0-nano in $(LOCAL_MODULE))

        LOCAL_JAVA_LIBRARIES := $(filter-out host-libprotobuf-java-2.3.0-nano,$(LOCAL_JAVA_LIBRARIES))

    endif

    LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-nano

  else

    ifneq ($(filter host-libprotobuf-java-2.3.0-lite,$(LOCAL_JAVA_LIBRARIES)),)

        $(warning Stripping unneeded dependency on host-libprotobuf-java-2.3.0-lite in $(LOCAL_MODULE))

        LOCAL_JAVA_LIBRARIES := $(filter-out host-libprotobuf-java-2.3.0-lite,$(LOCAL_JAVA_LIBRARIES))

    endif

    LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-lite

  endif

endif

core/java.mk

+0 −12
Original line number Diff line number Diff line
@@ -42,23 +42,11 @@ endif 
proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))

ifneq ($(proto_sources),)

ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)

    ifneq ($(filter libprotobuf-java-2.3.0-micro,$(LOCAL_STATIC_JAVA_LIBRARIES)),)

        $(warning Stripping unneeded dependency on libprotobuf-java-2.3.0-micro in $(LOCAL_MODULE))

        LOCAL_STATIC_JAVA_LIBRARIES := $(filter-out libprotobuf-java-2.3.0-micro,$(LOCAL_STATIC_JAVA_LIBRARIES))

    endif

    LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-micro

else

  ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)

    ifneq ($(filter libprotobuf-java-2.3.0-nano,$(LOCAL_STATIC_JAVA_LIBRARIES)),)

        $(warning Stripping unneeded dependency on libprotobuf-java-2.3.0-nano in $(LOCAL_MODULE))

        LOCAL_STATIC_JAVA_LIBRARIES := $(filter-out libprotobuf-java-2.3.0-nano,$(LOCAL_STATIC_JAVA_LIBRARIES))

    endif

    LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-nano

  else

    ifneq ($(filter libprotobuf-java-2.3.0-lite,$(LOCAL_STATIC_JAVA_LIBRARIES)),)

        $(warning Stripping unneeded dependency on libprotobuf-java-2.3.0-lite in $(LOCAL_MODULE))

        LOCAL_STATIC_JAVA_LIBRARIES := $(filter-out libprotobuf-java-2.3.0-lite,$(LOCAL_STATIC_JAVA_LIBRARIES))

    endif

    LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-lite

  endif

endif