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

Commit 6a5fc54f authored by Ulas Kirazci's avatar Ulas Kirazci Committed by Android Git Automerger
Browse files

am a825aa13: Merge "Allow proto builds to pass in java proto params." 

* commit 'a825aa13':
  Allow proto builds to pass in java proto params.
parents 6f9c87ed a825aa13

core/base_rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,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) : $(proto_sources_fullpath) $(PROTOC)

	$(call transform-proto-to-java)

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ LOCAL_BUILD_HOST_DEX:= 
LOCAL_DEX_PREOPT:= # '',true,false,nostripping

LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full

LOCAL_PROTOC_FLAGS:=

LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=

LOCAL_NO_CRT:=

LOCAL_PROPRIETARY_MODULE:=

LOCAL_MODULE_OWNER:=

core/definitions.mk

+4 −6
Original line number Diff line number Diff line
@@ -889,13 +889,11 @@ define transform-proto-to-java 
@echo "Protoc: $@ <= $(PRIVATE_PROTO_SRC_FILES)"

@rm -rf $(PRIVATE_PROTO_JAVA_OUTPUT_DIR)

@mkdir -p $(PRIVATE_PROTO_JAVA_OUTPUT_DIR)

$(hide) for f in $(PRIVATE_PROTO_SRC_FILES); do \

        $(PROTOC) \

        $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \

        $(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)=$(PRIVATE_PROTO_JAVA_OUTPUT_DIR) \

$(hide) $(PROTOC) \

        $(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)="$(PRIVATE_PROTO_JAVA_OUTPUT_PARAMS):$(PRIVATE_PROTO_JAVA_OUTPUT_DIR)" \

        $(PRIVATE_PROTOC_FLAGS) \

        $$f || exit 33; \

        done

        $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \

        $(PRIVATE_PROTO_SRC_FILES)

$(hide) touch $@

endef