commit 65e42ecd47bd23e68d0e5ee0dead33e6ca5b690d
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 16 20:26:22 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 16 20:26:22 2023 +0000
tree 42e2cf07db8aaa10c8dfab1d84ee596f18575c3c
parent 44ac6dad279f320f6c5cae445b5aded0ae5dd847
parent aa2b7cc21d4996c369870c9d69c1d9c49faf133a

Merge "Rename mk2rbc/cmd to make `go install` work properly"

mk2rbc/Android.bp

diff --git a/mk2rbc/Android.bp b/mk2rbc/Android.bp
index 4fa3eb6..cd80a4d 100644
--- a/mk2rbc/Android.bp
+++ b/mk2rbc/Android.bp
@@ -19,7 +19,7 @@
 
 blueprint_go_binary {
     name: "mk2rbc",
-    srcs: ["cmd/mk2rbc.go"],
+    srcs: ["mk2rbc/mk2rbc.go"],
     deps: [
         "mk2rbc-lib",
         "androidmk-parser",

mk2rbc/mk2rbc/mk2rbc.go

diff --git a/mk2rbc/cmd/mk2rbc.go b/mk2rbc/mk2rbc/mk2rbc.go
similarity index 100%
rename from mk2rbc/cmd/mk2rbc.go
rename to mk2rbc/mk2rbc/mk2rbc.go

soong_ui.bash

diff --git a/soong_ui.bash b/soong_ui.bash
index 1d027c4..8e7cd19 100755
--- a/soong_ui.bash
+++ b/soong_ui.bash
@@ -33,8 +33,8 @@
 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
+soong_build_go mk2rbc android/soong/mk2rbc/mk2rbc
+soong_build_go rbcrun rbcrun/rbcrun
 
 cd ${TOP}
 exec "$(getoutdir)/soong_ui" "$@"