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

Commit df036b4b authored by Spandan Das's avatar Spandan Das Committed by Android (Google) Code Review
Browse files

Merge "Ignore prebuilt apexes if PRODUCT_MODULE_BUILD_FROM_SOURCE is true" into main

parents 247a6215 ea0c5565
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -307,7 +307,14 @@ endif
# *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)))
  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 += \
  prebuilt_com.google.android.adservices \
  prebuilt_com.google.android.appsearch \