Merge "Rename mk2rbc/cmd to make go install work properly" am: 65e42ecd47

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2491117

Change-Id: Ifde8648b091f3532536e96b386e004666fe4a92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

mk2rbc/Android.bp

@@ -19,7 +19,7 @@ package {
 
 blueprint_go_binary {
     name: "mk2rbc",
-    srcs: ["cmd/mk2rbc.go"],
+    srcs: ["mk2rbc/mk2rbc.go"],
     deps: [
         "mk2rbc-lib",
         "androidmk-parser",

soong_ui.bash

@@ -33,8 +33,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
+soong_build_go mk2rbc android/soong/mk2rbc/mk2rbc
+soong_build_go rbcrun rbcrun/rbcrun
 
 cd ${TOP}
 exec "$(getoutdir)/soong_ui" "$@"