commit 154ff7ebc8baa00a28935697fb8dc1557efbe17d
author Yifeng Zeng <yifengzeng@google.com> Wed Nov 18 03:28:39 2020 +0000
committer Yifeng Zeng <yifengzeng@google.com> Wed Nov 18 03:34:01 2020 +0000
tree b50f05e632fb9656a1711d8a0ff2cd8dcde10b0c
parent 53ccfc38aa9c8c02e735f38f4ffdbd837846737b

Copy generated $(PRODUCT_OUT)/module-info.json file to dist when SOONG_COLLECT_JAVA_DEPS flag is set.

Test: build/soong/soong_ui.bash --make-mode SKIP_ABI_CHECKS=true SOONG_COLLECT_JAVA_DEPS=true TARGET_PRODUCT=aosp_cf_x86_phone TARGET_BUILD_VARIANT=userdebug droid dist DIST_DIR=/usr/local/google/home/yifengzeng/temp EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true CLANG_COVERAGE=true NATIVE_COVERAGE_PATHS="*" NATIVE_COVERAGE_EXCLUDE_PATHS="art bionic/libc device"

Bug: 168755196
Change-Id: I2b54d7cd1aaef1068ed5dfe35bfc4a8525b2e968

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 9b19761..88a93f1 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1639,6 +1639,7 @@
 
 ifeq ($(SOONG_COLLECT_JAVA_DEPS), true)
   $(call dist-for-goals, dist_files, $(SOONG_OUT_DIR)/module_bp_java_deps.json)
+  $(call dist-for-goals, dist_files, $(PRODUCT_OUT)/module-info.json)
 endif
 
 .PHONY: apps_only