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

Merge "APEX should require base module of stub libraries" am: 6345dfde49 am: f8ae216e9c am: c746c894b3 am: 4b4d680826

Browse Source 
Change-Id: I84e72cd661a4902511fb35f99315020d3aca4821
This commit is contained in:
Yo Chiang
2020-05-07 07:16:04 +00:00
committed by Automerger Merge Worker
parent e820959622 4b4d680826
commit 78f7d8dc67
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex.go
View File

@@ -2101,8 +2101,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// //
// Always include if we are a host-apex however since those won't have any // Always include if we are a host-apex however since those won't have any
// system libraries. // system libraries.
if !android.DirectlyInAnyApex(ctx, cc.Name()) && !android.InList(cc.Name(), a.requiredDeps) { if !android.DirectlyInAnyApex(ctx, cc.Name()) && !android.InList(cc.BaseModuleName(), a.requiredDeps) {
a.requiredDeps = append(a.requiredDeps, cc.Name()) a.requiredDeps = append(a.requiredDeps, cc.BaseModuleName())
} }
requireNativeLibs = append(requireNativeLibs, cc.OutputFile().Path().Base()) requireNativeLibs = append(requireNativeLibs, cc.OutputFile().Path().Base())
// Don't track further // Don't track further