Commit c11ff8ec authored Sep 29, 2020 by Yifeng Zeng Committed by Automerger Merge Worker Sep 29, 2020

Merge "Copy generated $(SOONG_OUT_DIR)/module_bp_java_deps.json file to dist...

Merge "Copy generated $(SOONG_OUT_DIR)/module_bp_java_deps.json file to dist when SOONG_COLLECT_JAVA_DEPS flag is set." am: 97a498b1 am: f54e9714 am: 4bead4d1 am: b2afcded am: ebb85cc2

Original change: https://android-review.googlesource.com/c/platform/build/+/1439143

Change-Id: I3915fea392d23c13ae6ad0abe87accc5bd6f729d

core/main.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -1639,6 +1639,10 @@ droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \
		# dist_files only for putting your library into the dist directory with a full build.
		.PHONY: dist_files

		ifeq ($(SOONG_COLLECT_JAVA_DEPS), true)
		$(call dist-for-goals, dist_files, $(SOONG_OUT_DIR)/module_bp_java_deps.json)
		endif

		.PHONY: apps_only
		ifneq ($(TARGET_BUILD_APPS),)
		# If this build is just for apps, only build apps and not the full system by default.