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

Commit e1c11d09 authored by Spandan Das's avatar Spandan Das
Browse files

Create a denylist for skipping apex contribution contents 

This denylist will be used to ignore the prebuilt google apexes listed
in apex_contributions of vendor/google/build when building aosp products
in next.

Test: in main, lunch aosp_cf_x86_64_phone-next-userdebug && m nothing
(with ag/25842580)
Bug: 308187268

Change-Id: I57a271d64bb940f36585fa3c666a3d95960a7083
parent fb3ce333

core/product_config.mk

+29 −0
Original line number Diff line number Diff line
@@ -301,6 +301,35 @@ 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.

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

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

endif



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



# Quick check and assign default values