Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89d97bf9 authored by LaMont Jones's avatar LaMont Jones
Browse files

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
parent 14d1d0b1

core/base_rules.mk

+5 −3
Original line number Diff line number Diff line
@@ -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)