Commit 154ff7eb authored Nov 18, 2020 by Yifeng Zeng

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

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

parent 53ccfc38

core/main.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -1639,6 +1639,7 @@ droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \

		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