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

Merge "Revert^2 "Default from-text stub generation in build"" into main am: 8c4387e478 am: 1a062bab81 am: 32fbd4a02b

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

Change-Id: If91cc1a8e7d00e275392ccbec65d511459fda14e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jihoon Kang
2023-11-10 05:29:32 +00:00
committed by Automerger Merge Worker
parent ad4e947bdd 32fbd4a02b
commit bb61391aba
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/config.go
View File

@@ -99,7 +99,7 @@ type CmdArgs struct {
UseBazelProxy bool
BuildFromTextStub bool
BuildFromSourceStub bool
EnsureAllowlistIntegrity bool
}
@@ -344,9 +344,9 @@ type config struct {
// unix sockets, instead of spawning Bazel as a subprocess.
UseBazelProxy bool
// If buildFromTextStub is true then the Java API stubs are
// built from the signature text files, not the source Java files.
buildFromTextStub bool
// If buildFromSourceStub is true then the Java API stubs are
// built from the source Java files, not the signature text files.
buildFromSourceStub bool
// If ensureAllowlistIntegrity is true, then the presence of any allowlisted
// modules that aren't mixed-built for at least one variant will cause a build
@@ -563,7 +563,7 @@ func NewConfig(cmdArgs CmdArgs, availableEnv map[string]string) (Config, error)
MultitreeBuild: cmdArgs.MultitreeBuild,
UseBazelProxy: cmdArgs.UseBazelProxy,
buildFromTextStub: cmdArgs.BuildFromTextStub,
buildFromSourceStub: cmdArgs.BuildFromSourceStub,
}
config.deviceConfig = &deviceConfig{
@@ -2082,11 +2082,11 @@ func (c *config) BuildFromTextStub() bool {
// TODO: b/302320354 - Remove the coverage build specific logic once the
// robust solution for handling native properties in from-text stub build
// is implemented.
return c.buildFromTextStub && !c.JavaCoverageEnabled()
return !c.buildFromSourceStub && !c.JavaCoverageEnabled()
}
func (c *config) SetBuildFromTextStub(b bool) {
c.buildFromTextStub = b
c.buildFromSourceStub = !b
c.productVariables.Build_from_text_stub = boolPtr(b)
}