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

Commit 3f443418 authored by Joe Onorato's avatar Joe Onorato Committed by android-build-merger
Browse files

Merge "When compiling with the lite protobuf option, pass the option to... 

Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime."
am: fa839296

Change-Id: Ibc8c2d2236d0b8cc1d77f741784a323171a07db5
parents 02ade236 fa839296

core/binary.mk

+4 −1
Original line number Diff line number Diff line
@@ -870,6 +870,9 @@ endif 
###########################################################

## Compile the .proto files to .cc (or .c) and then to .o

###########################################################

ifeq ($(strip $(LOCAL_PROTOC_OPTIMIZE_TYPE)),)

  LOCAL_PROTOC_OPTIMIZE_TYPE := lite

endif

proto_sources := $(filter %.proto,$(my_src_files))

ifneq ($(proto_sources),)

proto_gen_dir := $(generated_sources_dir)/proto
@@ -891,7 +894,7 @@ my_rename_cpp_ext := true 
endif

my_proto_c_includes := external/protobuf/src

my_cflags += -DGOOGLE_PROTOBUF_NO_RTTI

my_protoc_flags := --cpp_out=$(proto_gen_dir)

my_protoc_flags := --cpp_out=$(if $(filter lite lite-static,$(LOCAL_PROTOC_OPTIMIZE_TYPE)),lite:,)$(proto_gen_dir)

my_protoc_deps :=

endif

my_proto_c_includes += $(proto_gen_dir)

core/java_common.mk

+4 −1
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_ 
###########################################################

## .proto files: Compile proto files to .java

###########################################################

ifeq ($(strip $(LOCAL_PROTOC_OPTIMIZE_TYPE)),)

  LOCAL_PROTOC_OPTIMIZE_TYPE := lite

endif

proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))

# Because names of the .java files compiled from .proto files are unknown until the

# .proto files are compiled, we use a timestamp file as depedency.
@@ -67,7 +70,7 @@ $(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --java_out 
  endif

endif

$(proto_java_sources_file_stamp): PRIVATE_PROTOC_FLAGS := $(LOCAL_PROTOC_FLAGS)

$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_PARAMS := $(LOCAL_PROTO_JAVA_OUTPUT_PARAMS)

$(proto_java_sources_file_stamp): 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_sources_file_stamp) : $(proto_sources_fullpath) $(PROTOC)

	$(call transform-proto-to-java)