tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Always track transitive dependencies for host." am: abada78f05

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1531398

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic84e9d8eed6f3c9a530a4b492a62e478f62ca3f6
This commit is contained in:
Treehugger Robot 2020-12-16 13:33:13 +00:00 committed by Automerger Merge Worker
commit dc6328e6f1
1 changed files with 10 additions and 2 deletions
Show stats 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.transitiveDep = true
// Always track transitive dependencies for host.
if a.Host() {
filesInfo = append(filesInfo, af)
return true
}
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,
// 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
@ -1716,7 +1723,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// else-if clause for the indirect dependencies.
// Currently, that's impossible because we would
// 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) {
return false
}