StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "base_rules: Separate aconfig and module_info code" into main am: 0f0c6636ec

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2915007

Change-Id: I073414239c984d4614a989d9508b297332e16334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
LaMont Jones
2024-01-25 23:12:45 +00:00
committed by Automerger Merge Worker
parent 4a29d17d3e 0f0c6636ec
commit 04172f2e17
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/base_rules.mk
View File

@@ -1017,6 +1017,11 @@ ifdef LOCAL_IS_HOST_MODULE
my_required_modules += $(LOCAL_REQUIRED_MODULES_$($(my_prefix)OS)) my_required_modules += $(LOCAL_REQUIRED_MODULES_$($(my_prefix)OS))
endif 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 ifndef LOCAL_SOONG_MODULE_INFO_JSON
ALL_MAKE_MODULE_INFO_JSON_MODULES += $(my_register_name) ALL_MAKE_MODULE_INFO_JSON_MODULES += $(my_register_name)
ALL_MODULES.$(my_register_name).SHARED_LIBS := \ ALL_MODULES.$(my_register_name).SHARED_LIBS := \
@@ -1055,9 +1060,6 @@ ifndef LOCAL_SOONG_MODULE_INFO_JSON
$(ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS) \ $(ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS) \
$(filter-out $(ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS),$(my_supported_variant)) $(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 := \
$(ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES) $(LOCAL_COMPATIBILITY_SUITE) $(ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES) $(LOCAL_COMPATIBILITY_SUITE)
ALL_MODULES.$(my_register_name).MODULE_NAME := $(LOCAL_MODULE) ALL_MODULES.$(my_register_name).MODULE_NAME := $(LOCAL_MODULE)