commit 84c6c1cfe48d237181133e66e7c476a7e3d17702
author Dan Willemsen <dwillemsen@google.com> Mon Jun 10 16:31:07 2019 -0700
committer Dan Willemsen <dwillemsen@google.com> Mon Jun 10 16:31:07 2019 -0700
tree 79cac7f69ca90b4d4237298a331657c903b919a9
parent 236438ab1e8e785707cbf0fcde60ab9f82bd8039

Convert java proto generation to use srcjars

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

Test: treehugger
Change-Id: I48e32437fcfd8c0de8cbc87d07934393db557aa4

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 5d3227a..dfb1b7d 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1082,7 +1082,7 @@
         $(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 @@
 $(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: