From 2a27c02737d1837163f9994c8ae4e29c472c451f Mon Sep 17 00:00:00 2001 From: Dennis Shen Date: Fri, 23 Sep 2022 20:47:34 +0000 Subject: [PATCH] Make native libs available to DCLA apexes For now, bypass apex available check for native shared libs used by DCLA apexes, for the long term, created b/248601389 to create AOSP version of DCLA and mark necessary native shared libs available to this AOSP DCLA apex. BUG: 239679485 TEST: local build of DCLA modules, no apex_available issue found Change-Id: Ie08d555177bf19ec7c57009b798a41ce454fdeda --- android/apex.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/android/apex.go b/android/apex.go index 98b122eae..883bf14b6 100644 --- a/android/apex.go +++ b/android/apex.go @@ -456,7 +456,9 @@ func CheckAvailableForApex(what string, apex_available []string) bool { (what != AvailableToPlatform && InList(AvailableToAnyApex, apex_available)) || (what == "com.android.btservices" && InList("com.android.bluetooth", apex_available)) || // TODO b/243054261 (what == "com.android.bluetooth" && InList("com.android.btservices", apex_available)) || // TODO b/243054261 - (strings.HasPrefix(what, "com.android.gki.") && InList(AvailableToGkiApex, apex_available)) + (strings.HasPrefix(what, "com.android.gki.") && InList(AvailableToGkiApex, apex_available)) || + (what == "com.google.mainline.primary.libs") || // TODO b/248601389 + (what == "com.google.mainline.go.primary.libs") // TODO b/248601389 } // Implements ApexModule @@ -712,8 +714,8 @@ type ApexContents struct { // NewApexContents creates and initializes an ApexContents that is suitable // for use with an apex module. -// * contents is a map from a module name to information about its membership within -// the apex. +// - contents is a map from a module name to information about its membership within +// the apex. func NewApexContents(contents map[string]ApexMembership) *ApexContents { return &ApexContents{ contents: contents,