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

Commit 79d00080 authored by P.Y. Laligand's avatar P.Y. Laligand Committed by Android (Google) Code Review
Browse files

Merge "Add the correct dependency when the full version of the protocol buffer...

Merge "Add the correct dependency when the full version of the protocol buffer library is requested."
parents d99ede28 f7fb0e5e
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -49,11 +49,15 @@ ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)
else
  ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
    LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-nano
  else
    ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full)
      LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-full
    else
      LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-lite
    endif
  endif
endif
endif

LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src
LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))