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

Merge "Always track transitive dependencies for host."

Browse Source
This commit is contained in:
Treehugger Robot
2020-12-16 13:14:28 +00:00
committed by Gerrit Code Review
parent 7cd23e3d02 f2635ec434
commit abada78f05
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apex/apex.go
View File

@@ -1682,8 +1682,15 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
} }
af := apexFileForNativeLibrary(ctx, cc, handleSpecialLibs) af := apexFileForNativeLibrary(ctx, cc, handleSpecialLibs)
af.transitiveDep = true af.transitiveDep = true
// Always track transitive dependencies for host.
if a.Host() {
filesInfo = append(filesInfo, af)
return true
}
abInfo := ctx.Provider(ApexBundleInfoProvider).(ApexBundleInfo) abInfo := ctx.Provider(ApexBundleInfoProvider).(ApexBundleInfo)
if !a.Host() && !abInfo.Contents.DirectlyInApex(depName) && (cc.IsStubs() || cc.HasStubsVariants()) { if !abInfo.Contents.DirectlyInApex(depName) && (cc.IsStubs() || cc.HasStubsVariants()) {
// If the dependency is a stubs lib, don't include it in this APEX, // If the dependency is a stubs lib, don't include it in this APEX,
// but make sure that the lib is installed on the device. // but make sure that the lib is installed on the device.
// In case no APEX is having the lib, the lib is installed to the system // In case no APEX is having the lib, the lib is installed to the system
@@ -1716,7 +1723,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// else-if clause for the indirect dependencies. // else-if clause for the indirect dependencies.
// Currently, that's impossible because we would // Currently, that's impossible because we would
// like to record requiredNativeLibs even when // like to record requiredNativeLibs even when
// DepIsInSameAPex is false. // DepIsInSameAPex is false. We also shouldn't do
// this for host.
if !am.DepIsInSameApex(ctx, am) { if !am.DepIsInSameApex(ctx, am) {
return false return false
} }