StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move tradefed_binary.go into subdir

Browse Source 
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
This commit is contained in:
Jooyung Han
2020-10-19 10:08:22 +09:00
parent 509a9d35ac
commit 1e611b858f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tradefed/Android.bp
View File

@@ -15,7 +15,7 @@ bootstrap_go_package {
bootstrap_go_package { bootstrap_go_package {
name: "soong-suite-harness", name: "soong-suite-harness",
pkgPath: "android/soong/suite_harness", pkgPath: "android/soong/tradefed/suite_harness",
deps: [ deps: [
"blueprint", "blueprint",
"blueprint-pathtools", "blueprint-pathtools",
@@ -25,7 +25,7 @@ bootstrap_go_package {
"soong-java", "soong-java",
], ],
srcs: [ srcs: [
"tradefed_binary.go", "suite_harness/tradefed_binary.go",
], ],
pluginFor: ["soong_build"], pluginFor: ["soong_build"],
} }

2
tradefed/tradefed_binary.go → tradefed/suite_harness/tradefed_binary.go
View File

@@ -23,7 +23,7 @@ import (
"android/soong/java" "android/soong/java"
) )
var pctx = android.NewPackageContext("android/soong/suite_harness") var pctx = android.NewPackageContext("android/soong/tradefed/suite_harness")
func init() { func init() {
android.RegisterModuleType("tradefed_binary_host", tradefedBinaryFactory) android.RegisterModuleType("tradefed_binary_host", tradefedBinaryFactory)