Merge "bp2build: avoid adding deps on system_shared_libs temporarily." am: 5ea6e801e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1710972 Change-Id: I2e6f817f076fe4513d8672ee145603b82cbd9910
This commit is contained in:
@@ -91,12 +91,15 @@ func depsBp2BuildMutator(ctx android.BottomUpMutatorContext) {
|
||||
allDeps = append(allDeps, lib.SharedProperties.Shared.Static_libs...)
|
||||
allDeps = append(allDeps, lib.SharedProperties.Shared.Whole_static_libs...)
|
||||
allDeps = append(allDeps, lib.SharedProperties.Shared.Shared_libs...)
|
||||
allDeps = append(allDeps, lib.SharedProperties.Shared.System_shared_libs...)
|
||||
|
||||
allDeps = append(allDeps, lib.StaticProperties.Static.Static_libs...)
|
||||
allDeps = append(allDeps, lib.StaticProperties.Static.Whole_static_libs...)
|
||||
allDeps = append(allDeps, lib.StaticProperties.Static.Shared_libs...)
|
||||
allDeps = append(allDeps, lib.StaticProperties.Static.System_shared_libs...)
|
||||
|
||||
// TODO(b/186024507, b/186489250): Temporarily exclude adding
|
||||
// system_shared_libs deps until libc and libm builds.
|
||||
// allDeps = append(allDeps, lib.SharedProperties.Shared.System_shared_libs...)
|
||||
// allDeps = append(allDeps, lib.StaticProperties.Static.System_shared_libs...)
|
||||
}
|
||||
|
||||
ctx.AddDependency(module, nil, android.SortedUniqueStrings(allDeps)...)
|
||||
|
Reference in New Issue
Block a user