Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f656b843 authored by Lukacs T. Berki's avatar Lukacs T. Berki
Browse files

Cut the multiproduct_kati -> soong-ui-build dep. 

This is done by moving SetupSignals() to its own little package.

There are a number of tiny little utility packages for soong_ui we might
be better of merging, but that's for another change (maybe)

Test: Presubmits.
Change-Id: I07b0ca98bfb8884ef4223d665e632183b9896a0d
parent 2c40569d

cmd/multiproduct_kati/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package { 
blueprint_go_binary {

    name: "multiproduct_kati",

    deps: [

        "soong-ui-build",

        "soong-ui-logger",

        "soong-ui-signal",

        "soong-ui-terminal",

        "soong-ui-tracer",

        "soong-zip",

cmd/multiproduct_kati/main.go

+19 −20
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ import ( 
	"syscall"

	"time"



	"android/soong/ui/build"

	"android/soong/ui/logger"

	"android/soong/ui/signal"

	"android/soong/ui/status"

	"android/soong/ui/terminal"

	"android/soong/ui/tracer"
@@ -127,12 +127,12 @@ func copyFile(from, to string) error { 
}



type mpContext struct {

	Context context.Context

	Logger logger.Logger

	Status status.ToolStatus

	Tracer  tracer.Tracer



	LogsDir string

	SoongUi     string

	MainOutDir  string

	MainLogsDir string

}



func detectTotalRAM() uint64 {
@@ -179,7 +179,7 @@ func main() { 


	flag.Parse()



	ctx, cancel := context.WithCancel(context.Background())

	_, cancel := context.WithCancel(context.Background())

	defer cancel()



	trace := tracer.New(log)
@@ -192,7 +192,7 @@ func main() { 
	var failures failureCount

	stat.AddOutput(&failures)



	build.SetupSignals(log, cancel, func() {

	signal.SetupSignals(log, cancel, func() {

		trace.Close()

		log.Cleanup()

		stat.Finish()
@@ -310,12 +310,11 @@ func main() { 
	s.SetTotalActions(len(finalProductsList))



	mpCtx := &mpContext{

		Context: ctx,

		Logger:      log,

		Status:      s,

		Tracer:  trace,



		LogsDir: logsDir,

		SoongUi:     soongUi,

		MainOutDir:  outputDir,

		MainLogsDir: logsDir,

	}



	products := make(chan string, len(productsList))
@@ -337,7 +336,7 @@ func main() { 
					if product == "" {

						return

					}

					runSoongUiForProduct(mpCtx, product, soongUi, outputDir)

					runSoongUiForProduct(mpCtx, product)

				}

			}

		}()
@@ -391,10 +390,10 @@ func cleanupAfterProduct(outDir, productZip string) { 
	}

}



func runSoongUiForProduct(mpctx *mpContext, product, soongUi, mainOutDir string) {

	outDir := filepath.Join(mainOutDir, product)

	logsDir := filepath.Join(mpctx.LogsDir, product)

	productZip := filepath.Join(mainOutDir, product+".zip")

func runSoongUiForProduct(mpctx *mpContext, product string) {

	outDir := filepath.Join(mpctx.MainOutDir, product)

	logsDir := filepath.Join(mpctx.MainLogsDir, product)

	productZip := filepath.Join(mpctx.MainOutDir, product+".zip")

	consoleLogPath := filepath.Join(logsDir, "std.log")



	if err := os.MkdirAll(outDir, 0777); err != nil {
@@ -429,7 +428,7 @@ func runSoongUiForProduct(mpctx *mpContext, product, soongUi, mainOutDir string) 
		args = append(args, "dist")

	}



	cmd := exec.Command(soongUi, args...)

	cmd := exec.Command(mpctx.SoongUi, args...)

	cmd.Stdout = consoleLogWriter

	cmd.Stderr = consoleLogWriter

	cmd.Env = append(os.Environ(),

cmd/soong_ui/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ blueprint_go_binary { 
    name: "soong_ui",

    deps: [

        "soong-ui-build",

        "soong-ui-signal",

        "soong-ui-logger",

        "soong-ui-terminal",

        "soong-ui-tracer",

cmd/soong_ui/main.go

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import ( 
	"android/soong/ui/build"

	"android/soong/ui/logger"

	"android/soong/ui/metrics"

	"android/soong/ui/signal"

	"android/soong/ui/status"

	"android/soong/ui/terminal"

	"android/soong/ui/tracer"
@@ -190,7 +191,7 @@ func main() { 
	stat.AddOutput(trace.StatusTracer())



	// Set up a cleanup procedure in case the normal termination process doesn't work.

	build.SetupSignals(log, cancel, func() {

	signal.SetupSignals(log, cancel, func() {

		trace.Close()

		log.Cleanup()

		stat.Finish()

cuj/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ blueprint_go_binary { 
    deps: [

        "soong-ui-build",

        "soong-ui-logger",

        "soong-ui-signal",

        "soong-ui-terminal",

        "soong-ui-tracer",

    ],