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

Commit b8e58b16 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Make javamicro a plugin" am: c61d0f96 am: fb4c69ee am: 6c67eb98 

am: e982683c

Change-Id: I79f149be64b2780831408cd0daeaaaf0434f2edc
parents fafd5642 e982683c

core/java_common.mk

+10 −12
Original line number Diff line number Diff line
@@ -82,19 +82,17 @@ $(proto_java_srcjar): PRIVATE_PROTO_JAVA_OUTPUT_DIR := $(proto_java_sources_dir) 
$(proto_java_srcjar): PRIVATE_PROTOC_FLAGS := $(LOCAL_PROTOC_FLAGS)

ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)

  $(proto_java_srcjar): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javamicro_out

else

  ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)

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

  $(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

  else

    ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),stream)

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

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

else

  $(proto_java_srcjar): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --java_out

endif

  endif

endif

$(proto_java_srcjar): PRIVATE_PROTO_JAVA_OUTPUT_PARAMS := $(if $(filter lite,$(LOCAL_PROTOC_OPTIMIZE_TYPE)),lite$(if $(LOCAL_PROTO_JAVA_OUTPUT_PARAMS),:,),)$(LOCAL_PROTO_JAVA_OUTPUT_PARAMS)

$(proto_java_srcjar) : $(proto_sources_fullpath) $(PROTOC) $(SOONG_ZIP)

	$(call transform-proto-to-java)