diff options
| author | Jihoon Kang <jihoonkang@google.com> | 2023-06-08 19:02:07 +0000 |
|---|---|---|
| committer | Jihoon Kang <jihoonkang@google.com> | 2023-11-08 04:25:52 +0000 |
| commit | 2a929ad250972cc702b6e81843546b37428f5fa8 (patch) | |
| tree | 86547c9441c06b760061943f13b9e75f47ac905b /ui | |
| parent | 2ab031f467d047df7e59b792eab16570cd389d35 (diff) | |
Revert^2 "Default from-text stub generation in build"
This change defaults Java stubs to be generated from API text files
during build. Using the `--build-from-source-stubs` flag, users can
toggle between the feature.
This change relands aosp/2617457.
Test: m nothing && verify ninja path exists between android_stubs_current and android_stubs_current.from-text, and does not exist between android_stubs_current.from-source, m nothing --build-from-source-stub && verify the opposite
Bug: 301522358
Change-Id: Ic129dafc3231e71470af982374739930947b69cb
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/build/config.go | 8 | ||||
| -rw-r--r-- | ui/build/soong.go | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index 20d920485..d345415b5 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -86,7 +86,7 @@ type configImpl struct { searchApiDir bool // Scan the Android.bp files generated in out/api_surfaces skipMetricsUpload bool buildStartedTime int64 // For metrics-upload-only - manually specify a build-started time - buildFromTextStub bool + buildFromSourceStub bool ensureAllowlistIntegrity bool // For CI builds - make sure modules are mixed-built bazelExitCode int32 // For b runs - necessary for updating NonZeroExit besId string // For b runs, to identify the BuildEventService logs @@ -820,8 +820,8 @@ func (c *configImpl) parseArgs(ctx Context, args []string) { } else { ctx.Fatalf("unknown option for ninja_weight_source: %s", source) } - } else if arg == "--build-from-text-stub" { - c.buildFromTextStub = true + } else if arg == "--build-from-source-stub" { + c.buildFromSourceStub = true } else if strings.HasPrefix(arg, "--build-command=") { buildCmd := strings.TrimPrefix(arg, "--build-command=") // remove quotations @@ -1156,7 +1156,7 @@ func (c *configImpl) SkipConfig() bool { } func (c *configImpl) BuildFromTextStub() bool { - return c.buildFromTextStub + return !c.buildFromSourceStub } func (c *configImpl) TargetProduct() string { diff --git a/ui/build/soong.go b/ui/build/soong.go index 90f1798f3..667f0c90b 100644 --- a/ui/build/soong.go +++ b/ui/build/soong.go @@ -193,8 +193,8 @@ func (pb PrimaryBuilderFactory) primaryBuilderInvocation() bootstrap.PrimaryBuil if pb.config.multitreeBuild { commonArgs = append(commonArgs, "--multitree-build") } - if pb.config.buildFromTextStub { - commonArgs = append(commonArgs, "--build-from-text-stub") + if pb.config.buildFromSourceStub { + commonArgs = append(commonArgs, "--build-from-source-stub") } commonArgs = append(commonArgs, "-l", filepath.Join(pb.config.FileListDir(), "Android.bp.list")) @@ -310,8 +310,8 @@ func bootstrapBlueprint(ctx Context, config Config) { if config.MultitreeBuild() { mainSoongBuildExtraArgs = append(mainSoongBuildExtraArgs, "--multitree-build") } - if config.buildFromTextStub { - mainSoongBuildExtraArgs = append(mainSoongBuildExtraArgs, "--build-from-text-stub") + if config.buildFromSourceStub { + mainSoongBuildExtraArgs = append(mainSoongBuildExtraArgs, "--build-from-source-stub") } if config.ensureAllowlistIntegrity { mainSoongBuildExtraArgs = append(mainSoongBuildExtraArgs, "--ensure-allowlist-integrity") |