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

Commit 133f72f6 authored by Spandan Das's avatar Spandan Das
Browse files

Convert BuildIgnoreApexContritbutions variable to a boolean 

The ignore list is burdensome to maintain once we start adding the
module sdk contents to apex_contributions. Convert the variable to a
boolean. When set to true, all contents in `apex_contributions` will be
ignored

Bug: 308187268
Test: m nothing on aosp,google and google_fullmte devices
Ignore-AOSP-first: CL topic does a cleanup of an internal only denylist

Change-Id: If899f6eaf5449c2aa789d0bd5b791a3db715c676
parent 07fd1762

core/product.mk

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,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

+1 −20
Original line number Diff line number Diff line
@@ -315,26 +315,7 @@ ifeq (true,$(PRODUCT_MODULE_BUILD_FROM_SOURCE)) 
  ignore_apex_contributions := true

endif

ifeq (true, $(ignore_apex_contributions))

PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS += \

  prebuilt_com.google.android.adservices \

  prebuilt_com.google.android.appsearch \

  prebuilt_com.google.android.art \

  prebuilt_com.google.android.btservices \

  prebuilt_com.google.android.configinfrastructure \

  prebuilt_com.google.android.conscrypt \

  prebuilt_com.google.android.devicelock \

  prebuilt_com.google.android.healthfitness \

  prebuilt_com.google.android.ipsec \

  prebuilt_com.google.android.media \

  prebuilt_com.google.android.mediaprovider \

  prebuilt_com.google.android.ondevicepersonalization \

  prebuilt_com.google.android.os.statsd \

  prebuilt_com.google.android.rkpd \

  prebuilt_com.google.android.scheduling \

  prebuilt_com.google.android.sdkext \

  prebuilt_com.google.android.tethering \

  prebuilt_com.google.android.uwb \

  prebuilt_com.google.android.wifi

PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS := true

endif



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

core/soong_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,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)))