Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d36a5a0 authored by Jingwen Chen's avatar Jingwen Chen Committed by Automerger Merge Worker
Browse files

Merge "bp2build: avoid adding deps on system_shared_libs temporarily." am:... 

Merge "bp2build: avoid adding deps on system_shared_libs temporarily." am: 5ea6e801 am: 07bdd0fd

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

Change-Id: Id7348b08e4382eddf654d02383154eadfd1b3926
parents 32669567 07bdd0fd

cc/bp2build.go

+5 −2
Original line number Diff line number Diff line
@@ -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)...)