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

Commit 84c6c1cf authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Convert java proto generation to use srcjars 

So that we actually represent all files in the build graph.

Test: treehugger
Change-Id: I48e32437fcfd8c0de8cbc87d07934393db557aa4
parent 236438ab

core/definitions.mk

+1 −3
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ $(hide) for f in $(PRIVATE_PROTO_SRC_FILES); do \ 
        $(PRIVATE_PROTOC_FLAGS) \

        $$f || exit 33; \

        done

$(hide) touch $@

$(SOONG_ZIP) -o $@ -C $(PRIVATE_PROTO_JAVA_OUTPUT_DIR) -D $(PRIVATE_PROTO_JAVA_OUTPUT_DIR)

endef



######################################################################
@@ -2013,8 +2013,6 @@ define fetch-additional-java-source 
$(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \

    find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' -and -not -name '.*' >> $(1); \

fi

$(if $(PRIVATE_HAS_PROTO_SOURCES), \

    $(hide) find $(PRIVATE_PROTO_SOURCE_INTERMEDIATES_DIR) -name '*.java' -and -not -name '.*' >> $(1))

endef



# Some historical notes:

core/host_dalvik_java_library.mk

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ $(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON) 
java_sources_deps := \

    $(java_sources) \

    $(java_resource_sources) \

    $(proto_java_sources_file_stamp) \

    $(LOCAL_SRCJARS) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

core/host_java_library.mk

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE)) 
java_sources_deps := \

    $(java_sources) \

    $(java_resource_sources) \

    $(proto_java_sources_file_stamp) \

    $(LOCAL_SRCJARS) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

core/java.mk

+0 −1
Original line number Diff line number Diff line
@@ -233,7 +233,6 @@ endif 
java_sources_deps := \

    $(java_sources) \

    $(java_resource_sources) \

    $(proto_java_sources_file_stamp) \

    $(LOCAL_SRCJARS) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

core/java_common.mk

+15 −18
Original line number Diff line number Diff line
@@ -67,37 +67,36 @@ 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.

proto_java_sources_file_stamp :=

ifneq ($(proto_sources),)

proto_sources_fullpath := $(addprefix $(LOCAL_PATH)/, $(proto_sources))



proto_java_intemediate_dir := $(intermediates.COMMON)/proto

proto_java_sources_file_stamp := $(proto_java_intemediate_dir)/Proto.stamp

proto_java_sources_dir := $(proto_java_intemediate_dir)/src

proto_java_srcjar := $(intermediates.COMMON)/proto.srcjar



$(proto_java_sources_file_stamp): PRIVATE_PROTO_INCLUDES := $(TOP)

$(proto_java_sources_file_stamp): PRIVATE_PROTO_SRC_FILES := $(proto_sources_fullpath)

$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_DIR := $(proto_java_sources_dir)

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

LOCAL_SRCJARS += $(proto_java_srcjar)



$(proto_java_srcjar): PRIVATE_PROTO_INCLUDES := $(TOP)

$(proto_java_srcjar): PRIVATE_PROTO_SRC_FILES := $(proto_sources_fullpath)

$(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_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javamicro_out

$(proto_java_srcjar): 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

$(proto_java_srcjar): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javanano_out

  else

    ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),stream)

$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javastream_out

$(proto_java_sources_file_stamp): PRIVATE_PROTOC_FLAGS += --plugin=$(HOST_OUT_EXECUTABLES)/protoc-gen-javastream

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

$(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_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --java_out

$(proto_java_srcjar): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --java_out

    endif

  endif

endif

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

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



#TODO: protoc should output the dependencies introduced by imports.
@@ -231,8 +230,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR) 
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates.COMMON)/classes

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ANNO_INTERMEDIATES_DIR := $(intermediates.COMMON)/anno

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SOURCE_INTERMEDIATES_DIR := $(intermediates.COMMON)/src

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HAS_PROTO_SOURCES := $(if $(proto_sources),true)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PROTO_SOURCE_INTERMEDIATES_DIR := $(intermediates.COMMON)/proto

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HAS_RS_SOURCES :=

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCES := $(all_java_sources)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCE_LIST := $(java_source_list_file)