Loading core/product.mk +0 −3 Original line number Diff line number Diff line Loading @@ -304,9 +304,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 Loading core/product_config.mk +0 −21 Original line number Diff line number Diff line Loading @@ -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` Loading core/soong_config.mk +0 −1 Original line number Diff line number Diff line Loading @@ -313,7 +313,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)) Loading Loading
core/product.mk +0 −3 Original line number Diff line number Diff line Loading @@ -304,9 +304,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 Loading
core/product_config.mk +0 −21 Original line number Diff line number Diff line Loading @@ -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` Loading
core/soong_config.mk +0 −1 Original line number Diff line number Diff line Loading @@ -313,7 +313,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)) Loading