Merge changes from topics "nested-nsjail", "ro-api-surfaces-dir"

* changes:
  Special-case Soong finder to look in out/api_surfaces
  nsjail support verification should respect BUILD_BROKEN* flag for SrcDir
This commit is contained in:
Spandan Das
2022-11-15 19:56:23 +00:00
committed by Gerrit Code Review
5 changed files with 33 additions and 10 deletions

View File

@@ -243,6 +243,11 @@ func runApiBp2build(configuration android.Config, ctx *android.Context, extraNin
// Exclude all src BUILD files
excludes = append(excludes, apiBuildFileExcludes()...)
// Android.bp files for api surfaces are mounted to out/, but out/ should not be a
// dep for api_bp2build.
// Otherwise api_bp2build will be run every single time
excludes = append(excludes, configuration.OutDir())
// Create the symlink forest
symlinkDeps := bp2build.PlantSymlinkForest(
configuration.IsEnvTrue("BP2BUILD_VERBOSE"),