tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "move microfactory main.main() to microfactory.bash" am: 5233841b7a am: b4bf67a92d am: c08c30d94c am: 45cb422da1

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2179719

Change-Id: I7028e06433e6a4620c12f0dd6d268454f46a01c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-08-09 20:24:32 +00:00 committed by Automerger Merge Worker
commit d14bb35ceb
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
microfactory/microfactory.bash
View file

@ -51,6 +51,7 @@ function build_go
local gen_src_dir="${BUILDDIR}/.microfactory_$(uname)_intermediates/src" local gen_src_dir="${BUILDDIR}/.microfactory_$(uname)_intermediates/src"
mkdir -p "${gen_src_dir}" mkdir -p "${gen_src_dir}"
sed "s/^package microfactory/package main/" "${mf_src}/microfactory.go" >"${gen_src_dir}/microfactory.go" sed "s/^package microfactory/package main/" "${mf_src}/microfactory.go" >"${gen_src_dir}/microfactory.go"
printf "\n//for use with go run\nfunc main() { Main() }\n" >>"${gen_src_dir}/microfactory.go"
mf_cmd="${GOROOT}/bin/go run ${gen_src_dir}/microfactory.go" mf_cmd="${GOROOT}/bin/go run ${gen_src_dir}/microfactory.go"
else else

2
microfactory/microfactory.go
View file

@ -617,8 +617,6 @@ func rebuildMicrofactory(config *Config, mybin string) bool {
return true return true
} }
// microfactory.bash will make a copy of this file renamed into the main package for use with `go run`
func main() { Main() }
func Main() { func Main() {
var output, mybin string var output, mybin string
var config Config var config Config