From 4637dafb94628bec76ce328da8fb911c47c8bfe6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 8 Jan 2024 14:26:56 -0800 Subject: [PATCH] Remove last reference to SOONG_COLLECT_JAVA_DEPS SOONG_COLLECT_JAVA_DEPS was uncondtionally enabled in If30ad5dbabb6709f834134cbc9a513a9bdc9d9de, remove the conditional check for disting the results. The prevents rerunning Make analysis in ASfP, which is setting SOONG_COLLECT_JAVA_DEPS=true. Test: builds Change-Id: Ibecbeeefda3fec43c8a54b5ff80835e331bab1fc --- core/main.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/main.mk b/core/main.mk index 348a964e0a..649c75c1a2 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1721,10 +1721,8 @@ droidcore: droidcore-unbundled # 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) - $(call dist-for-goals, dist_files, $(PRODUCT_OUT)/module-info.json) -endif +$(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) .PHONY: apps_only ifeq ($(HOST_OS),darwin)