From f7554e37355e2abc63ea180b0659372910b241e3 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 21 Aug 2023 11:47:39 -0700 Subject: [PATCH] Ignore vndk compat symlinks in artifact path requirements A change is being made to properly track apex compat symlinks in the installation logic, which causes the artifact path requirements to start complaining about them. Exclude them from the artifact path requirements. Bug: 205632228 Test: m nothing Change-Id: I46150c3b7a4eaac16c2daa80fec2a5640e32b61b --- target/product/gsi_release.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index e39af92ae5..bd85b9f51e 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -28,10 +28,15 @@ BUILDING_GSI := true -# Exclude all files under system/product and system/system_ext +# Exclude all files under system/product and system/system_ext, +# and the vndk apex's compat symlinks PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ system/product/% \ - system/system_ext/% + system/system_ext/% \ + system/lib/vndk-29 \ + system/lib/vndk-sp-29 \ + system/lib64/vndk-29 \ + system/lib64/vndk-sp-29 # GSI should always support up-to-date platform features. # Keep this value at the latest API level to ensure latest build system