Merge changes from topic "b/273282046" (56df0913) · Commits · e / os / android_build_soong

android/allowlists/allowlists.go

+29 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@ const (
		// all modules in this package and subpackages default to bp2build_available: false.
		// allows modules to opt-in.
		Bp2BuildDefaultFalseRecursively

		DEFAULT_NINJA_WEIGHT = 1000
		)

		var (
		@@ -1466,4 +1468,31 @@ var (
		// "libssl",
		// "libstagefright_flacdec",
		// "libutils",

		// TODO(b/273282046): Make this list customizable to support various targets.
		// The list of modules which are expected to spend lots of build time.
		// With `--ninja_weight_source=soong`, ninja builds these modules and deps first.
		HugeModulesMap = map[string]int{
		"libbt_packets": DEFAULT_NINJA_WEIGHT,
		"libbt_packets_nonapex": DEFAULT_NINJA_WEIGHT,
		"crosvm": DEFAULT_NINJA_WEIGHT,
		"system-api-stubs-docs-non-updatable": DEFAULT_NINJA_WEIGHT,
		"test-api-stubs-docs-non-updatable": DEFAULT_NINJA_WEIGHT,
		"module-lib-api-stubs-docs-non-updatable": DEFAULT_NINJA_WEIGHT,
		"libdevices": DEFAULT_NINJA_WEIGHT,
		"libaom": DEFAULT_NINJA_WEIGHT,
		"libart-disassembler": DEFAULT_NINJA_WEIGHT,
		"libart": DEFAULT_NINJA_WEIGHT,
		"libprotobuf": DEFAULT_NINJA_WEIGHT,
		"libsyn": DEFAULT_NINJA_WEIGHT,
		"api-stubs-docs-non-updatable": DEFAULT_NINJA_WEIGHT,
		"framework-res": DEFAULT_NINJA_WEIGHT,
		"SystemUI-core": DEFAULT_NINJA_WEIGHT,
		"services-non-updatable-stubs": DEFAULT_NINJA_WEIGHT,
		"art.module.public.api.stubs.source": DEFAULT_NINJA_WEIGHT,
		"art.module.intra.core.api.stubs.source": DEFAULT_NINJA_WEIGHT,
		"virtmgr": DEFAULT_NINJA_WEIGHT,
		"metalava": DEFAULT_NINJA_WEIGHT,
		"libkeystore2": DEFAULT_NINJA_WEIGHT,
		}
		)

cmd/soong_build/main.go

+27 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import (
		"time"

		"android/soong/android"
		"android/soong/android/allowlists"
		"android/soong/bazel"
		"android/soong/bp2build"
		"android/soong/shared"
		@@ -252,6 +253,29 @@ func apiBuildFileExcludes(ctx *android.Context) []string {
		return ret
		}

		func writeNinjaHint(ctx *android.Context) error {
		wantModules := make([]string, len(allowlists.HugeModulesMap))
		i := 0
		for k := range allowlists.HugeModulesMap {
		wantModules[i] = k
		i += 1
		}
		outputsMap := ctx.Context.GetOutputsFromModuleNames(wantModules)
		var outputBuilder strings.Builder
		for k, v := range allowlists.HugeModulesMap {
		for _, output := range outputsMap[k] {
		outputBuilder.WriteString(fmt.Sprintf("%s,%d\n", output, v))
		}
		}
		weightListFile := filepath.Join(topDir, ctx.Config().OutDir(), ".ninja_weight_list")

		err := os.WriteFile(weightListFile, []byte(outputBuilder.String()), 0644)
		if err != nil {
		return fmt.Errorf("could not write ninja weight list file %s", err)
		}
		return nil
		}

		func writeMetrics(configuration android.Config, eventHandler *metrics.EventHandler, metricsDir string) {
		if len(metricsDir) < 1 {
		fmt.Fprintf(os.Stderr, "\nMissing required env var for generating soong metrics: LOG_DIR\n")
		@@ -412,6 +436,9 @@ func main() {
		} else {
		finalOutputFile = runSoongOnlyBuild(ctx, extraNinjaDeps)
		}
		if ctx.Config().IsEnvTrue("SOONG_GENERATES_NINJA_HINT") {
		writeNinjaHint(ctx)
		}
		writeMetrics(configuration, ctx.EventHandler, metricsDir)
		}
		writeUsedEnvironmentFile(configuration, finalOutputFile)

ui/build/config.go

+44 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,10 @@ const (
		NINJA_LOG
		// ninja thinks every task has the same weight.
		EVENLY_DISTRIBUTED
		// ninja uses an external custom weight list
		EXTERNAL_FILE
		// ninja uses a prioritized module list from Soong
		HINT_FROM_SOONG
		)
		const srcDirFileCheck = "build/soong/root.bp"

		@@ -317,6 +321,10 @@ func NewConfig(ctx Context, args ...string) Config {

		ret.totalRAM = detectTotalRAM(ctx)
		ret.parseArgs(ctx, args)

		if ret.ninjaWeightListSource == HINT_FROM_SOONG {
		ret.environ.Set("SOONG_GENERATES_NINJA_HINT", "true")
		}
		// Make sure OUT_DIR is set appropriately
		if outDir, ok := ret.environ.Get("OUT_DIR"); ok {
		ret.environ.Set("OUT_DIR", filepath.Clean(outDir))
		@@ -547,6 +555,10 @@ func getNinjaWeightListSourceInMetric(s NinjaWeightListSource) *smpb.BuildConfig
		return smpb.BuildConfig_NINJA_LOG.Enum()
		case EVENLY_DISTRIBUTED:
		return smpb.BuildConfig_EVENLY_DISTRIBUTED.Enum()
		case EXTERNAL_FILE:
		return smpb.BuildConfig_EXTERNAL_FILE.Enum()
		case HINT_FROM_SOONG:
		return smpb.BuildConfig_HINT_FROM_SOONG.Enum()
		default:
		return smpb.BuildConfig_NOT_USED.Enum()
		}
		@@ -830,6 +842,19 @@ func (c *configImpl) parseArgs(ctx Context, args []string) {
		c.ninjaWeightListSource = EVENLY_DISTRIBUTED
		} else if source == "not_used" {
		c.ninjaWeightListSource = NOT_USED
		} else if source == "soong" {
		c.ninjaWeightListSource = HINT_FROM_SOONG
		} else if strings.HasPrefix(source, "file,") {
		c.ninjaWeightListSource = EXTERNAL_FILE
		filePath := strings.TrimPrefix(source, "file,")
		err := validateNinjaWeightList(filePath)
		if err != nil {
		ctx.Fatalf("Malformed weight list from %s: %s", filePath, err)
		}
		_, err = copyFile(filePath, filepath.Join(c.OutDir(), ".ninja_weight_list"))
		if err != nil {
		ctx.Fatalf("Error to copy ninja weight list from %s: %s", filePath, err)
		}
		} else {
		ctx.Fatalf("unknown option for ninja_weight_source: %s", source)
		}
		@@ -903,6 +928,25 @@ func (c *configImpl) parseArgs(ctx Context, args []string) {
		}
		}

		func validateNinjaWeightList(weightListFilePath string) (err error) {
		data, err := os.ReadFile(weightListFilePath)
		if err != nil {
		return
		}
		lines := strings.Split(strings.TrimSpace(string(data)), "\n")
		for _, line := range lines {
		fields := strings.Split(line, ",")
		if len(fields) != 2 {
		return fmt.Errorf("wrong format, each line should have two fields, but '%s'", line)
		}
		_, err = strconv.Atoi(fields[1])
		if err != nil {
		return
		}
		}
		return
		}

		func (c *configImpl) configureLocale(ctx Context) {
		cmd := Command(ctx, Config{c}, "locale", "locale", "-a")
		output, err := cmd.Output()

ui/build/ninja.go

+10 −3

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ const (
		// File containing the environment state when ninja is executed
		ninjaEnvFileName = "ninja.environment"
		ninjaLogFileName = ".ninja_log"
		ninjaWeightListFileName = ".ninja_weight_list"
		)

		func useNinjaBuildLog(ctx Context, config Config, cmd *Cmd) {
		@@ -66,7 +67,7 @@ func useNinjaBuildLog(ctx Context, config Config, cmd *Cmd) {
		ctx.Verbosef("There is an error during reading ninja log, so ninja will use empty weight list: %s", err)
		}

		weightListFile := filepath.Join(config.OutDir(), ".ninja_weight_list")
		weightListFile := filepath.Join(config.OutDir(), ninjaWeightListFileName)

		err = os.WriteFile(weightListFile, []byte(outputBuilder.String()), 0644)
		if err == nil {
		@@ -134,6 +135,12 @@ func runNinjaForBuild(ctx Context, config Config) {
		case EVENLY_DISTRIBUTED:
		// pass empty weight list means ninja considers every tasks's weight as 1(default value).
		cmd.Args = append(cmd.Args, "-o", "usesweightlist=/dev/null")
		case EXTERNAL_FILE:
		fallthrough
		case HINT_FROM_SOONG:
		// The weight list is already copied/generated.
		ninjaWeightListPath := filepath.Join(config.OutDir(), ninjaWeightListFileName)
		cmd.Args = append(cmd.Args, "-o", "usesweightlist="+ninjaWeightListPath)
		}

		// Allow both NINJA_ARGS and NINJA_EXTRA_ARGS, since both have been

ui/metrics/metrics_proto/metrics.pb.go

+170 −160

File changed.

Preview size limit exceeded, changes collapsed.