diff options
| author | Colin Cross <ccross@android.com> | 2017-12-21 15:46:01 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-12-22 13:56:17 -0800 |
| commit | 8d6395c09d868751c85082d71356ad790e924df9 (patch) | |
| tree | c2a369e5f3d766c609ebd980668d181ddaaf5c39 | |
| parent | 7b60cdd6e5d81ae6e929d61898f4faefb1ddb8e2 (diff) | |
| download | build_soong-8d6395c09d868751c85082d71356ad790e924df9.tar.gz build_soong-8d6395c09d868751c85082d71356ad790e924df9.tar.bz2 build_soong-8d6395c09d868751c85082d71356ad790e924df9.zip | |
Move android/soong/fs to android/soong/finder/fs
The fs package is specific to finder, move it inside finder.
Bug: 70897635
Test: m checkbuild
Change-Id: Ie705f064a832141702a8e87fd59ed75c01018504
| -rw-r--r-- | finder/Android.bp | 2 | ||||
| -rw-r--r-- | finder/cmd/finder.go | 2 | ||||
| -rw-r--r-- | finder/finder.go | 2 | ||||
| -rw-r--r-- | finder/finder_test.go | 4 | ||||
| -rw-r--r-- | finder/fs/Android.bp (renamed from fs/Android.bp) | 4 | ||||
| -rw-r--r-- | finder/fs/fs.go (renamed from fs/fs.go) | 0 | ||||
| -rw-r--r-- | finder/fs/fs_darwin.go (renamed from fs/fs_darwin.go) | 0 | ||||
| -rw-r--r-- | finder/fs/fs_linux.go (renamed from fs/fs_linux.go) | 0 | ||||
| -rw-r--r-- | ui/build/finder.go | 2 |
9 files changed, 8 insertions, 8 deletions
diff --git a/finder/Android.bp b/finder/Android.bp index b5c0e130..47b47c9d 100644 --- a/finder/Android.bp +++ b/finder/Android.bp @@ -30,7 +30,7 @@ bootstrap_go_package { "finder_test.go", ], deps: [ - "soong-fs", + "soong-finder-fs", ], } diff --git a/finder/cmd/finder.go b/finder/cmd/finder.go index 70c1dc4a..ab9108f6 100644 --- a/finder/cmd/finder.go +++ b/finder/cmd/finder.go @@ -28,7 +28,7 @@ import ( "time" "android/soong/finder" - "android/soong/fs" + "android/soong/finder/fs" ) var ( diff --git a/finder/finder.go b/finder/finder.go index 2dd8e0b0..ce174757 100644 --- a/finder/finder.go +++ b/finder/finder.go @@ -30,7 +30,7 @@ import ( "sync/atomic" "time" - "android/soong/fs" + "android/soong/finder/fs" ) // This file provides a Finder struct that can quickly search for files satisfying diff --git a/finder/finder_test.go b/finder/finder_test.go index 1522c680..29711fc2 100644 --- a/finder/finder_test.go +++ b/finder/finder_test.go @@ -21,12 +21,12 @@ import ( "os" "path/filepath" "reflect" + "runtime/debug" "sort" "testing" "time" - "android/soong/fs" - "runtime/debug" + "android/soong/finder/fs" ) // some utils for tests to use diff --git a/fs/Android.bp b/finder/fs/Android.bp index f4706ca2..fe0a0d36 100644 --- a/fs/Android.bp +++ b/finder/fs/Android.bp @@ -17,8 +17,8 @@ // bootstrap_go_package { - name: "soong-fs", - pkgPath: "android/soong/fs", + name: "soong-finder-fs", + pkgPath: "android/soong/finder/fs", srcs: [ "fs.go", ], diff --git a/fs/fs.go b/finder/fs/fs.go index eff8ad07..eff8ad07 100644 --- a/fs/fs.go +++ b/finder/fs/fs.go diff --git a/fs/fs_darwin.go b/finder/fs/fs_darwin.go index c0488358..c0488358 100644 --- a/fs/fs_darwin.go +++ b/finder/fs/fs_darwin.go diff --git a/fs/fs_linux.go b/finder/fs/fs_linux.go index 0a22a2c9..0a22a2c9 100644 --- a/fs/fs_linux.go +++ b/finder/fs/fs_linux.go diff --git a/ui/build/finder.go b/ui/build/finder.go index a0f5d088..3bd6d87c 100644 --- a/ui/build/finder.go +++ b/ui/build/finder.go @@ -16,7 +16,7 @@ package build import ( "android/soong/finder" - "android/soong/fs" + "android/soong/finder/fs" "android/soong/ui/logger" "bytes" "io/ioutil" |