From 1e611b858f3b297e185e9de9777e4c214a3c0aa3 Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Mon, 19 Oct 2020 10:08:22 +0900
Subject: [PATCH] Move tradefed_binary.go into subdir

Having two packages in the same directory makes it harder for go tools
to understande the directory structure.

For example, in build/soong, "go test ./cc/..." fails with cyclic
package imports.

Bug: n/a
Test: go test ./cc/... (in build/soong)
Change-Id: I7a040bf30b1e001680dd43fed9747e9651372274
---
 tradefed/Android.bp                             | 4 ++--
 tradefed/{ => suite_harness}/tradefed_binary.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename tradefed/{ => suite_harness}/tradefed_binary.go (98%)

diff --git a/tradefed/Android.bp b/tradefed/Android.bp
index f4e8334f0..4e4e6a7ee 100644
--- a/tradefed/Android.bp
+++ b/tradefed/Android.bp
@@ -15,7 +15,7 @@ bootstrap_go_package {
 
 bootstrap_go_package {
     name: "soong-suite-harness",
-    pkgPath: "android/soong/suite_harness",
+    pkgPath: "android/soong/tradefed/suite_harness",
     deps: [
         "blueprint",
         "blueprint-pathtools",
@@ -25,7 +25,7 @@ bootstrap_go_package {
         "soong-java",
     ],
     srcs: [
-        "tradefed_binary.go",
+        "suite_harness/tradefed_binary.go",
     ],
     pluginFor: ["soong_build"],
 }
diff --git a/tradefed/tradefed_binary.go b/tradefed/suite_harness/tradefed_binary.go
similarity index 98%
rename from tradefed/tradefed_binary.go
rename to tradefed/suite_harness/tradefed_binary.go
index 7960fdc88..1bd4f93dc 100644
--- a/tradefed/tradefed_binary.go
+++ b/tradefed/suite_harness/tradefed_binary.go
@@ -23,7 +23,7 @@ import (
 	"android/soong/java"
 )
 
-var pctx = android.NewPackageContext("android/soong/suite_harness")
+var pctx = android.NewPackageContext("android/soong/tradefed/suite_harness")
 
 func init() {
 	android.RegisterModuleType("tradefed_binary_host", tradefedBinaryFactory)