Move partner androidmk and bpfix files to match their package path
Using a gomod-aware editor with build/soong requires that files
in build/soong can be mapped to the android/soong package path.
Move the partner androidmk and bpfix files such that their path
matches the package path when the android/soong package prefix is
replaced with the build/soong path prefix.
Test: go test ./...
Test: m bpfix androidmk partner_bpfix partner_androidmk
Change-Id: Ic7f7aad9e5eb9178eef0383f0b37e4fb93ce8314
diff --git a/bpfix/Android.bp b/bpfix/Android.bp
index aec9ff9..e291578 100644
--- a/bpfix/Android.bp
+++ b/bpfix/Android.bp
@@ -28,9 +28,9 @@
bootstrap_go_package {
name: "bpfix-cmd",
- pkgPath: "android/soong/bpfix/bpfix/cmd",
+ pkgPath: "android/soong/bpfix/cmd_lib",
srcs: [
- "cmd-lib/bpfix.go",
+ "cmd_lib/bpfix.go",
],
deps: [
"bpfix-lib",
diff --git a/bpfix/cmd/main.go b/bpfix/cmd/main.go
index 8ca16b4..ad68144 100644
--- a/bpfix/cmd/main.go
+++ b/bpfix/cmd/main.go
@@ -16,10 +16,8 @@
package main
-import (
- "android/soong/bpfix/bpfix/cmd"
-)
+import "android/soong/bpfix/cmd_lib"
func main() {
- cmd.Run()
+ cmd_lib.Run()
}
diff --git a/bpfix/cmd-lib/bpfix.go b/bpfix/cmd_lib/bpfix.go
similarity index 99%
rename from bpfix/cmd-lib/bpfix.go
rename to bpfix/cmd_lib/bpfix.go
index 98122f2..f90f65b 100644
--- a/bpfix/cmd-lib/bpfix.go
+++ b/bpfix/cmd_lib/bpfix.go
@@ -16,7 +16,7 @@
// TODO(jeffrygaston) should this file be consolidated with bpfmt.go?
-package cmd
+package cmd_lib
import (
"bytes"
diff --git a/androidmk/partner_androidmk/Android.bp b/partner/Android.bp
similarity index 71%
rename from androidmk/partner_androidmk/Android.bp
rename to partner/Android.bp
index 532116a..f2ced8d 100644
--- a/androidmk/partner_androidmk/Android.bp
+++ b/partner/Android.bp
@@ -1,4 +1,4 @@
-// Copyright 2015 Google Inc. All rights reserved.
+// Copyright 2019 Google Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -19,31 +19,31 @@
blueprint_go_binary {
name: "partner_androidmk",
srcs: [
- "partner_androidmk/androidmk.go",
+ "androidmk/androidmk.go",
],
testSrcs: [
- "partner_androidmk/androidmk_test.go",
+ "androidmk/androidmk_test.go",
],
deps: [
"androidmk-lib",
- "partner_bpfix_extensions",
+ "partner-bpfix-extensions",
],
}
blueprint_go_binary {
name: "partner_bpfix",
srcs: [
- "partner_bpfix/bpfix.go",
+ "bpfix/bpfix.go",
],
deps: [
"bpfix-cmd",
- "partner_bpfix_extensions",
+ "partner-bpfix-extensions",
],
}
bootstrap_go_package {
- name: "partner_bpfix_extensions",
- pkgPath: "partner/android/bpfix/extensions",
- srcs: ["fixes/headers.go"],
+ name: "partner-bpfix-extensions",
+ pkgPath: "android/soong/partner/bpfix/extensions",
+ srcs: ["bpfix/extensions/headers.go"],
deps: ["bpfix-lib"],
}
diff --git a/androidmk/partner_androidmk/partner_androidmk/androidmk.go b/partner/androidmk/androidmk.go
similarity index 96%
rename from androidmk/partner_androidmk/partner_androidmk/androidmk.go
rename to partner/androidmk/androidmk.go
index af8cdf3..f49981b 100644
--- a/androidmk/partner_androidmk/partner_androidmk/androidmk.go
+++ b/partner/androidmk/androidmk.go
@@ -23,7 +23,7 @@
"android/soong/androidmk/androidmk"
- _ "partner/android/bpfix/extensions"
+ _ "android/soong/partner/bpfix/extensions"
)
var usage = func() {
diff --git a/androidmk/partner_androidmk/partner_androidmk/androidmk_test.go b/partner/androidmk/androidmk_test.go
similarity index 97%
rename from androidmk/partner_androidmk/partner_androidmk/androidmk_test.go
rename to partner/androidmk/androidmk_test.go
index ff04e88..6bae836 100644
--- a/androidmk/partner_androidmk/partner_androidmk/androidmk_test.go
+++ b/partner/androidmk/androidmk_test.go
@@ -23,7 +23,7 @@
"android/soong/androidmk/androidmk"
"android/soong/bpfix/bpfix"
- _ "partner/android/bpfix/extensions"
+ _ "android/soong/partner/bpfix/extensions"
)
var testCases = []struct {
diff --git a/androidmk/partner_androidmk/partner_bpfix/bpfix.go b/partner/bpfix/bpfix.go
similarity index 88%
rename from androidmk/partner_androidmk/partner_bpfix/bpfix.go
rename to partner/bpfix/bpfix.go
index 2c8e0a8..687fe1c 100644
--- a/androidmk/partner_androidmk/partner_bpfix/bpfix.go
+++ b/partner/bpfix/bpfix.go
@@ -17,11 +17,11 @@
package main
import (
- "android/soong/bpfix/bpfix/cmd"
+ "android/soong/bpfix/cmd_lib"
- _ "partner/android/bpfix/extensions"
+ _ "android/soong/partner/bpfix/extensions"
)
func main() {
- cmd.Run()
+ cmd_lib.Run()
}
diff --git a/androidmk/partner_androidmk/fixes/headers.go b/partner/bpfix/extensions/headers.go
similarity index 100%
rename from androidmk/partner_androidmk/fixes/headers.go
rename to partner/bpfix/extensions/headers.go