Merge branch 'lineage-23.1' of https://github.com/LineageOS/android_build_soong into HEADw16.1

* 'lineage-23.1' of https://github.com/LineageOS/android_build_soong: (528 commits)
  Revert "install_symlink: Make symlink target configurable"
  Reapply "Clear as much of cc.Module as possible after GenerateBuildActions"
  Revert "rust: config: Fix missing CPU variant LD flags in Rust"
  Rename build-flag in outdir
  Revert^4 "cipd: Default CIPD proxy server to on, add opt-out"
  Convert check-vintf-all to phony with actions
  Create a partial implementation of check-vintf-all for soong-only
  Configure RBE rust pool based on build variant
  Revert^3 "Add sdk version check to arr"
  Add jdk.internal.invoke to the allowlist
  Make droid always depend on symbols zip
  Import Device and Odm skus
  Don't install gob_gen in Soong
  Remove bazel reference from run_integration_tests.sh
  Fix bootstrap_test.sh
  Don't panic in aconfig libraries when AllowMissingDependencies is set
  Avoid returning nil paths from PathForModuleSrc
  Revert "Flag controled clang version"
  Rework module target dependencies on required deps
  Revert^2 "Add sdk version check to arr"
  ...

Change-Id: I6e9a63fa14fda917a42e426e5dcebbad7f67e1de

1 files changed, 12 insertions, 43 deletions

diff --git a/ui/metrics/metrics.go b/ui/metrics/metrics.go
index 8d29cfc2d..458572a1e 100644
--- a/ui/metrics/metrics.go
+++ b/ui/metrics/metrics.go
@@ -58,7 +58,6 @@ const (
 	RunSoong     = "soong"
 	PrimaryNinja = "ninja"
 	RunKati      = "kati"
-	RunBazel     = "bazel"
 
 	// Overall build from building the graph to building the target.
 	Total = "total"
@@ -102,31 +101,33 @@ func (m *Metrics) SetToplevelMakefiles(total int) {
 	m.mkMetrics.ToplevelMakefiles = uint32(total)
 }
 
+func (m *Metrics) SetSoongOnly(soongOnly bool) {
+	m.metrics.BuildConfig.SoongOnly = &soongOnly
+}
+
 func (m *Metrics) DumpMkMetrics(outPath string) {
 	shared.Save(&m.mkMetrics, outPath)
 }
 
 // SetTimeMetrics stores performance information from an executed block of
 // code.
-func (m *Metrics) SetTimeMetrics(perf soong_metrics_proto.PerfInfo) {
+func (m *Metrics) SetTimeMetrics(perf *soong_metrics_proto.PerfInfo) {
 	switch perf.GetName() {
 	case RunKati:
-		m.metrics.KatiRuns = append(m.metrics.KatiRuns, &perf)
+		m.metrics.KatiRuns = append(m.metrics.KatiRuns, perf)
 	case RunSoong:
-		m.metrics.SoongRuns = append(m.metrics.SoongRuns, &perf)
-	case RunBazel:
-		m.metrics.BazelRuns = append(m.metrics.BazelRuns, &perf)
+		m.metrics.SoongRuns = append(m.metrics.SoongRuns, perf)
 	case PrimaryNinja:
-		m.metrics.NinjaRuns = append(m.metrics.NinjaRuns, &perf)
+		m.metrics.NinjaRuns = append(m.metrics.NinjaRuns, perf)
 	case RunSetupTool:
-		m.metrics.SetupTools = append(m.metrics.SetupTools, &perf)
+		m.metrics.SetupTools = append(m.metrics.SetupTools, perf)
 	case Total:
-		m.metrics.Total = &perf
+		m.metrics.Total = perf
 	}
 }
 
-func (m *Metrics) SetCriticalPathInfo(criticalPathInfo soong_metrics_proto.CriticalPathInfo) {
-	m.metrics.CriticalPathInfo = &criticalPathInfo
+func (m *Metrics) SetCriticalPathInfo(criticalPathInfo *soong_metrics_proto.CriticalPathInfo) {
+	m.metrics.CriticalPathInfo = criticalPathInfo
 }
 
 // SetFatalOrPanicMessage stores a non-zero exit and the relevant message in the latest event if
@@ -254,35 +255,3 @@ func (m *Metrics) Dump(out string) error {
 
 	return shared.Save(&m.metrics, out)
 }
-
-// SetSoongBuildMetrics sets the metrics collected from the soong_build
-// execution.
-func (m *Metrics) SetSoongBuildMetrics(metrics *soong_metrics_proto.SoongBuildMetrics) {
-	m.metrics.SoongBuildMetrics = metrics
-}
-
-// A CriticalUserJourneysMetrics is a struct that contains critical user journey
-// metrics. These critical user journeys are defined under cuj/cuj.go file.
-type CriticalUserJourneysMetrics struct {
-	// A list of collected CUJ metrics.
-	cujs soong_metrics_proto.CriticalUserJourneysMetrics
-}
-
-// NewCriticalUserJourneyMetrics returns a pointer of CriticalUserJourneyMetrics
-// to capture CUJs metrics.
-func NewCriticalUserJourneysMetrics() *CriticalUserJourneysMetrics {
-	return &CriticalUserJourneysMetrics{}
-}
-
-// Add adds a set of collected metrics from an executed critical user journey.
-func (c *CriticalUserJourneysMetrics) Add(name string, metrics *Metrics) {
-	c.cujs.Cujs = append(c.cujs.Cujs, &soong_metrics_proto.CriticalUserJourneyMetrics{
-		Name:    proto.String(name),
-		Metrics: &metrics.metrics,
-	})
-}
-
-// Dump saves the collected CUJs metrics to the raw protobuf file.
-func (c *CriticalUserJourneysMetrics) Dump(filename string) (err error) {
-	return shared.Save(&c.cujs, filename)
-}