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

Commit 8d8f816a authored by Spandan Das's avatar Spandan Das Committed by Gerrit Code Review
Browse files

Merge "Convert BuildIgnoreApexContritbutions variable to a boolean" into main

parents f764c46f 7f52f2a8

core/product.mk

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ _product_list_vars += PRODUCT_VALIDATION_CHECKS 


_product_single_value_vars += PRODUCT_BUILD_FROM_SOURCE_STUB



_product_list_vars += PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS

_product_single_value_vars += PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS



_product_single_value_vars += PRODUCT_HIDDEN_API_EXPORTABLE_STUBS

core/product_config.mk

+17 −0
Original line number Diff line number Diff line
@@ -301,6 +301,23 @@ ifeq (, $(PRODUCT_INCLUDE_TAGS)) 
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`

# *for aosp products*.

# TODO(b/308187268): Remove this denylist mechanism

# Use PRODUCT_PACKAGES to determine if this is an aosp product. aosp products do not use google signed apexes.

ignore_apex_contributions :=

ifeq (,$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES))$(findstring com.google.android.go.conscrypt,$(PRODUCT_PACKAGES)))

  ignore_apex_contributions := true

endif

ifeq (true,$(PRODUCT_MODULE_BUILD_FROM_SOURCE))

  ignore_apex_contributions := true

endif

ifeq (true, $(ignore_apex_contributions))

PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS := true

endif



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



# Quick check and assign default values

core/soong_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ $(call add_json_bool, KeepVndk, $(filter true,$(KEEP_VNDK))) 


$(call add_json_bool, CheckVendorSeappViolations, $(filter true,$(CHECK_VENDOR_SEAPP_VIOLATIONS)))



$(call add_json_list, BuildIgnoreApexContributionContents, $(sort $(PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS)))

$(call add_json_bool, BuildIgnoreApexContributionContents, $(PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS))



$(call add_json_map, PartitionVarsForBazelMigrationOnlyDoNotUse)

  $(call add_json_str,  ProductDirectory,    $(dir $(INTERNAL_PRODUCT)))