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

Commit 5094e33b authored by Ulas Kirazci's avatar Ulas Kirazci Committed by Gerrit Code Review
Browse files

Merge "Revert "Allow proto builds to pass in java proto params.""

parents be581317 24c7289d

core/base_rules.mk

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

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ 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

+6 −4
Original line number Diff line number Diff line
@@ -889,11 +889,13 @@ 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) $(PROTOC) \

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

        $(PRIVATE_PROTOC_FLAGS) \

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

        $(PROTOC) \

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

        $(PRIVATE_PROTO_SRC_FILES)

        $(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)=$(PRIVATE_PROTO_JAVA_OUTPUT_DIR) \

        $(PRIVATE_PROTOC_FLAGS) \

        $$f || exit 33; \

        done

$(hide) touch $@

endef