From 262f73c8318cdd3a02ad4c5120f6193a64e84cb2 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Thu, 28 Mar 2024 11:29:47 +0900 Subject: [PATCH] VINTF manifests in apex don't require extension libvintf reads all entries from vintf directory. The apex build rule should match with it. Bug: 331474817 Test: build with aosp/3017012/1 Change-Id: Ida5fce2436ec5985e2fb4c2a3608bf20f4933582 --- apex/builder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apex/builder.go b/apex/builder.go index 6ad282ab6..50db631b7 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -485,7 +485,7 @@ func markManifestTestOnly(ctx android.ModuleContext, androidManifestFile android } func isVintfFragment(fi apexFile) bool { - isVintfFragment, _ := path.Match("etc/vintf/*.xml", fi.path()) + isVintfFragment, _ := path.Match("etc/vintf/*", fi.path()) return isVintfFragment }