From 89d97bf901d8cde9f3b2431fc048a03565717f42 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Thu, 25 Jan 2024 18:52:16 +0000 Subject: [PATCH] base_rules: Separate aconfig and module_info code Record LOCAL_ACONFIG_FILES when LOCAL_SOONG_MODULE_INFO_JSON is defined. Bug: b/308625757 Test: out/soong/module-info-${TARGET_PRODUCT}.json is unchanged Test: fixes some aconfig flags. Change-Id: I7ca9d2723e38ec5588bc6ada8769320a0b63bcb5 --- core/base_rules.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/base_rules.mk b/core/base_rules.mk index 1793f00008..44e1c7a058 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -1017,6 +1017,11 @@ ifdef LOCAL_IS_HOST_MODULE my_required_modules += $(LOCAL_REQUIRED_MODULES_$($(my_prefix)OS)) endif +ifdef LOCAL_ACONFIG_FILES + ALL_MODULES.$(my_register_name).ACONFIG_FILES := \ + $(ALL_MODULES.$(my_register_name).ACONFIG_FILES) $(LOCAL_ACONFIG_FILES) +endif + ifndef LOCAL_SOONG_MODULE_INFO_JSON ALL_MAKE_MODULE_INFO_JSON_MODULES += $(my_register_name) ALL_MODULES.$(my_register_name).SHARED_LIBS := \ @@ -1055,9 +1060,6 @@ ifndef LOCAL_SOONG_MODULE_INFO_JSON $(ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS) \ $(filter-out $(ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS),$(my_supported_variant)) - ALL_MODULES.$(my_register_name).ACONFIG_FILES := \ - $(ALL_MODULES.$(my_register_name).ACONFIG_FILES) $(LOCAL_ACONFIG_FILES) - ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES := \ $(ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES) $(LOCAL_COMPATIBILITY_SUITE) ALL_MODULES.$(my_register_name).MODULE_NAME := $(LOCAL_MODULE)