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
diff --git a/finder/Android.bp b/finder/Android.bp
index b5c0e13..47b47c9 100644
--- a/finder/Android.bp
+++ b/finder/Android.bp
@@ -30,7 +30,7 @@
"finder_test.go",
],
deps: [
- "soong-fs",
+ "soong-finder-fs",
],
}
diff --git a/finder/cmd/finder.go b/finder/cmd/finder.go
index 70c1dc4..ab9108f 100644
--- a/finder/cmd/finder.go
+++ b/finder/cmd/finder.go
@@ -28,7 +28,7 @@
"time"
"android/soong/finder"
- "android/soong/fs"
+ "android/soong/finder/fs"
)
var (
diff --git a/finder/finder.go b/finder/finder.go
index 2dd8e0b..ce17475 100644
--- a/finder/finder.go
+++ b/finder/finder.go
@@ -30,7 +30,7 @@
"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 1522c68..29711fc 100644
--- a/finder/finder_test.go
+++ b/finder/finder_test.go
@@ -21,12 +21,12 @@
"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
similarity index 92%
rename from fs/Android.bp
rename to finder/fs/Android.bp
index f4706ca..fe0a0d3 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
similarity index 100%
rename from fs/fs.go
rename to finder/fs/fs.go
diff --git a/fs/fs_darwin.go b/finder/fs/fs_darwin.go
similarity index 100%
rename from fs/fs_darwin.go
rename to finder/fs/fs_darwin.go
diff --git a/fs/fs_linux.go b/finder/fs/fs_linux.go
similarity index 100%
rename from fs/fs_linux.go
rename to finder/fs/fs_linux.go
diff --git a/ui/build/finder.go b/ui/build/finder.go
index a0f5d08..3bd6d87 100644
--- a/ui/build/finder.go
+++ b/ui/build/finder.go
@@ -16,7 +16,7 @@
import (
"android/soong/finder"
- "android/soong/fs"
+ "android/soong/finder/fs"
"android/soong/ui/logger"
"bytes"
"io/ioutil"