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

Commit 0262d0f7 authored Apr 02, 2013 by Wink Saville Committed by Gerrit Code Review Apr 02, 2013

Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."

parents a1fd8e44 76e3a390

core/base_rules.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -256,9 +256,13 @@ $(proto_java_sources_file_stamp): PRIVATE_PROTO_SRC_FILES := $(proto_sources_ful
		$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_DIR := $(proto_java_sources_dir)
		ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)
		$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javamicro_out
		else
		ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
		$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javanano_out
		else
		$(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) : $(proto_sources_fullpath) $(PROTOC)
		$(call transform-proto-to-java)

core/clear_vars.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ LOCAL_RENDERSCRIPT_FLAGS:=
		LOCAL_RENDERSCRIPT_TARGET_API:=
		LOCAL_BUILD_HOST_DEX:=
		LOCAL_DEX_PREOPT:= # '',true,false,nostripping
		LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,full
		LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full
		LOCAL_PROTOC_FLAGS:=
		LOCAL_NO_CRT:=
		LOCAL_PROPRIETARY_MODULE:=

core/java.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -51,10 +51,14 @@ proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))
		ifneq ($(proto_sources),)
		ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)
		LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-2.3.0-micro
		else
		ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
		LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-2.3.0-nano
		else
		LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-2.3.0-lite
		endif
		endif
		endif

		LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))