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

Commit 7930dd7f authored by Spandan Das's avatar Spandan Das
Browse files

Drop product config include tags 

This product config variables were previously used to prune Android.bp
files from soong analysis using blueprint_package_includes

Bug: 308188212
Test: m nothing
Change-Id: If3f88dbe2abb2db5f1112981e706d8a2cb228895
parent 22135a0b

core/product.mk

+0 −3
Original line number Diff line number Diff line
@@ -303,9 +303,6 @@ _product_list_vars += PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION 
# This flag implies PRODUCT_USE_DYNAMIC_PARTITIONS.

_product_single_value_vars += PRODUCT_RETROFIT_DYNAMIC_PARTITIONS



# List of tags that will be used to gate blueprint modules from the build graph

_product_list_vars += PRODUCT_INCLUDE_TAGS



# List of directories that will be used to gate blueprint modules from the build graph

_product_list_vars += PRODUCT_SOURCE_ROOT_DIRS

core/product_config.mk

+0 −21
Original line number Diff line number Diff line
@@ -280,27 +280,6 @@ endif 


current_product_makefile :=



#############################################################################

# Check product include tag allowlist

BLUEPRINT_INCLUDE_TAGS_ALLOWLIST := \

  com.android.mainline_go \

  com.android.mainline \

  mainline_module_prebuilt_nightly \

  mainline_module_prebuilt_monthly_release

.KATI_READONLY := BLUEPRINT_INCLUDE_TAGS_ALLOWLIST

$(foreach include_tag,$(PRODUCT_INCLUDE_TAGS), \

	$(if $(filter $(include_tag),$(BLUEPRINT_INCLUDE_TAGS_ALLOWLIST)),,\

	$(call pretty-error, $(include_tag) is not in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST: $(BLUEPRINT_INCLUDE_TAGS_ALLOWLIST))))

# Create default PRODUCT_INCLUDE_TAGS

ifeq (, $(PRODUCT_INCLUDE_TAGS))

# Soong analysis is global: even though a module might not be relevant to a specific product (e.g. build_tools for aosp_arm),

# we still analyse it.

# This means that in setups where we two have two prebuilts of module_sdk, we need a "default" to use in analysis

# This should be a no-op in aosp and internal since no Android.bp file contains blueprint_package_includes

# Use the big android one and main-based prebuilts by default

PRODUCT_INCLUDE_TAGS += com.android.mainline mainline_module_prebuilt_nightly

endif



# AOSP and Google products currently share the same `apex_contributions` in next.

# This causes issues when building <aosp_product>-next-userdebug in main.

# Create a temporary allowlist to ignore the google apexes listed in `contents` of apex_contributions of `next`

core/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ $(call add_json_bool, GenerateAidlNdkPlatformBackend, $(filter true,$(NEED_AIDL_ 


$(call add_json_bool, IgnorePrefer32OnDevice, $(filter true,$(IGNORE_PREFER32_ON_DEVICE)))



$(call add_json_list, IncludeTags,                $(PRODUCT_INCLUDE_TAGS))

$(call add_json_list, SourceRootDirs,             $(PRODUCT_SOURCE_ROOT_DIRS))



$(call add_json_list, AfdoProfiles,                $(ALL_AFDO_PROFILES))