StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make native libs available to DCLA apexes

Browse Source 
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
This commit is contained in:
Dennis Shen
2022-09-23 20:47:34 +00:00
parent 96a6997b74
commit 2a27c02737
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/apex.go
View File

@@ -456,7 +456,9 @@ func CheckAvailableForApex(what string, apex_available []string) bool {
(what != AvailableToPlatform && InList(AvailableToAnyApex, apex_available)) || (what != AvailableToPlatform && InList(AvailableToAnyApex, apex_available)) ||
(what == "com.android.btservices" && InList("com.android.bluetooth", apex_available)) || // TODO b/243054261 (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 (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 // Implements ApexModule
@@ -712,7 +714,7 @@ type ApexContents struct {
// NewApexContents creates and initializes an ApexContents that is suitable // NewApexContents creates and initializes an ApexContents that is suitable
// for use with an apex module. // for use with an apex module.
// * contents is a map from a module name to information about its membership within // - contents is a map from a module name to information about its membership within
// the apex. // the apex.
func NewApexContents(contents map[string]ApexMembership) *ApexContents { func NewApexContents(contents map[string]ApexMembership) *ApexContents {
return &ApexContents{ return &ApexContents{