diff options
| author | Colin Cross <ccross@android.com> | 2019-11-08 14:17:49 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-11-11 15:44:09 -0800 |
| commit | ce23942f3c485232d49a8ed06ba0c443a2568a9d (patch) | |
| tree | b74f9b70e1634d29a14aa164b67e4e1a02611c03 /bpfix | |
| parent | 2d5ce8538b74b983b3b58d67a1c5272258d6bf26 (diff) | |
| download | soong-ce23942f3c485232d49a8ed06ba0c443a2568a9d.tar.gz | |
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
Diffstat (limited to 'bpfix')
| -rw-r--r-- | bpfix/Android.bp | 4 | ||||
| -rw-r--r-- | bpfix/cmd/main.go | 6 | ||||
| -rw-r--r-- | bpfix/cmd_lib/bpfix.go (renamed from bpfix/cmd-lib/bpfix.go) | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/bpfix/Android.bp b/bpfix/Android.bp index aec9ff9c1..e29157849 100644 --- a/bpfix/Android.bp +++ b/bpfix/Android.bp @@ -28,9 +28,9 @@ blueprint_go_binary { 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 8ca16b48f..ad6814493 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 index 98122f213..f90f65be6 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" |