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

Commit 64c50b35 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes from topic "protobuf-3.9.1" 

* changes:
  Keep proguard fields for lite runtime
  Install vendorcompat verison of protobuf
  Make javanano a plugin
parents 00a086cc 7a9acce4

core/java_common.mk

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro) 
  $(proto_java_srcjar): $(HOST_OUT_EXECUTABLES)/protoc-gen-javamicro

else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)

  $(proto_java_srcjar): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javanano_out

  $(proto_java_srcjar): PRIVATE_PROTOC_FLAGS += --plugin=$(HOST_OUT_EXECUTABLES)/protoc-gen-javanano

  $(proto_java_srcjar): $(HOST_OUT_EXECUTABLES)/protoc-gen-javanano

else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),stream)

  $(proto_java_srcjar): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javastream_out

  $(proto_java_srcjar): PRIVATE_PROTOC_FLAGS += --plugin=$(HOST_OUT_EXECUTABLES)/protoc-gen-javastream

core/proguard_basic_keeps.flags

+4 −0
Original line number Diff line number Diff line
@@ -72,3 +72,7 @@ 


# Less spammy.

-dontnote



# The lite proto runtime uses reflection to access fields based on the names in

# the schema, keep all the fields.

-keepclassmembers class * extends com.google.protobuf.MessageLite { <fields>; }

target/product/base_vendor.mk

+4 −0
Original line number Diff line number Diff line
@@ -75,3 +75,7 @@ PRODUCT_PACKAGES += \ 
# VINTF data for vendor image

PRODUCT_PACKAGES += \

    device_compatibility_matrix.xml \



PRODUCT_PACKAGES += \

    libprotobuf-cpp-lite-vendorcompat \

    libprotobuf-cpp-full-vendorcompat \