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

Refactor "staging dep on prod" allowlist dep am: 66fc74509f

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

Change-Id: I90f579f1af49ec512712c01e44a05d82f1817fd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Parsons
2022-11-08 16:39:00 +00:00
committed by Automerger Merge Worker
parent e3716ca39e 66fc74509f
commit 0adc255647
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android/allowlists/allowlists.go
View File

@@ -1339,9 +1339,12 @@ var (
"prebuilt_currysrc_org.eclipse", "prebuilt_currysrc_org.eclipse",
} }
// Bazel prod-mode allowlist. Modules in this list are built by Bazel
// in either prod mode or staging mode.
ProdMixedBuildsEnabledList = []string{} ProdMixedBuildsEnabledList = []string{}
// Staging builds should be entirely prod, plus some near-ready ones. Add the // Staging-mode allowlist. Modules in this list are only built
// new ones to the first argument as needed. // by Bazel with --bazel-mode-staging. This list should contain modules
StagingMixedBuildsEnabledList = append([]string{}, ProdMixedBuildsEnabledList...) // which will soon be added to the prod allowlist.
StagingMixedBuildsEnabledList = []string{}
) )

5
android/bazel_handler.go
View File

@@ -389,9 +389,12 @@ func NewBazelContext(c *config) (BazelContext, error) {
} }
case BazelStagingMode: case BazelStagingMode:
modulesDefaultToBazel = false modulesDefaultToBazel = false
// Staging mode includes all prod modules plus all staging modules.
for _, enabledProdModule := range allowlists.ProdMixedBuildsEnabledList {
enabledModules[enabledProdModule] = true
}
for _, enabledStagingMode := range allowlists.StagingMixedBuildsEnabledList { for _, enabledStagingMode := range allowlists.StagingMixedBuildsEnabledList {
enabledModules[enabledStagingMode] = true enabledModules[enabledStagingMode] = true
} }
case BazelDevMode: case BazelDevMode:
modulesDefaultToBazel = true modulesDefaultToBazel = true

2
android/config.go
View File

@@ -536,7 +536,7 @@ func (c *config) mockFileSystem(bp string, fs map[string][]byte) {
// Returns true if "Bazel builds" is enabled. In this mode, part of build // Returns true if "Bazel builds" is enabled. In this mode, part of build
// analysis is handled by Bazel. // analysis is handled by Bazel.
func (c *config) IsMixedBuildsEnabled() bool { func (c *config) IsMixedBuildsEnabled() bool {
return c.BuildMode == BazelProdMode || c.BuildMode == BazelDevMode return c.BuildMode == BazelProdMode || c.BuildMode == BazelDevMode || c.BuildMode == BazelStagingMode
} }
func (c *config) SetAllowMissingDependencies() { func (c *config) SetAllowMissingDependencies() {