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

Commit d9932ad0 authored by Cole Faust's avatar Cole Faust
Browse files

Always build mk2rbc/rbcrun 

Currently, mk2rbc/rbcrun aren't built in certain phases
of the build, which causes the Starlark product configuration
to fail when using get_build_var if a regular build hasn't
been run before.

Bug: 226677850
Test: Manually
Change-Id: If85608eef63be25fddc4d916c82247c13eb0195f
parent 4242115d

scripts/microfactory.bash

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ function soong_build_go 
    BUILDDIR=$(getoutdir) \

      SRCDIR=${TOP} \

      BLUEPRINTDIR=${TOP}/build/blueprint \

      EXTRA_ARGS="-pkg-path android/soong=${TOP}/build/soong -pkg-path google.golang.org/protobuf=${TOP}/external/golang-protobuf" \

      EXTRA_ARGS="-pkg-path android/soong=${TOP}/build/soong -pkg-path rbcrun=${TOP}/build/make/tools/rbcrun -pkg-path google.golang.org/protobuf=${TOP}/external/golang-protobuf -pkg-path go.starlark.net=${TOP}/external/starlark-go" \

      build_go $@

}

scripts/rbc-run

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
set -eu



declare -r output_root="${OUT_DIR:-out}"

declare -r runner="${output_root}/soong/rbcrun"

declare -r converter="${output_root}/soong/mk2rbc"

declare -r runner="${output_root}/rbcrun"

declare -r converter="${output_root}/mk2rbc"

declare -r launcher="${output_root}/rbc/launcher.rbc"

declare -r makefile_list="${output_root}/.module_paths/configuration.list"

declare -r makefile="$1"

soong_ui.bash

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ export TOP=$(gettop) 
source ${TOP}/build/soong/scripts/microfactory.bash



soong_build_go soong_ui android/soong/cmd/soong_ui

soong_build_go mk2rbc android/soong/mk2rbc/cmd

soong_build_go rbcrun rbcrun/cmd



cd ${TOP}

exec "$(getoutdir)/soong_ui" "$@"

tests/lib.sh

+2 −0
Original line number Diff line number Diff line
@@ -83,12 +83,14 @@ function symlink_directory() { 
function create_mock_soong {

  copy_directory build/blueprint

  copy_directory build/soong

  copy_directory build/make/tools/rbcrun



  symlink_directory prebuilts/go

  symlink_directory prebuilts/build-tools

  symlink_directory prebuilts/clang/host

  symlink_directory external/go-cmp

  symlink_directory external/golang-protobuf

  symlink_directory external/starlark-go



  touch "$MOCK_TOP/Android.bp"

}

ui/build/dumpvars.go

+0 −6
Original line number Diff line number Diff line
@@ -262,12 +262,6 @@ func runMakeProductConfig(ctx Context, config Config) { 
		"BUILD_BROKEN_USES_BUILD_STATIC_LIBRARY",

	}, exportEnvVars...), BannerVars...)



	// We need Roboleaf converter and runner in the mixed mode

	runMicrofactory(ctx, config, "mk2rbc", "android/soong/mk2rbc/cmd",

		map[string]string{"android/soong": "build/soong"})

	runMicrofactory(ctx, config, "rbcrun", "rbcrun/cmd",

		map[string]string{"go.starlark.net": "external/starlark-go", "rbcrun": "build/make/tools/rbcrun"})



	makeVars, err := dumpMakeVars(ctx, config, config.Arguments(), allVars, true, "")

	if err != nil {

		ctx.Fatalln("Error dumping make vars:", err)