Bladeren bron

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
Colin Cross 6 jaren geleden
bovenliggende
commit
8d6395c09d
9 gewijzigde bestanden met toevoegingen van 8 en 8 verwijderingen
  1. 1 1
      finder/Android.bp
  2. 1 1
      finder/cmd/finder.go
  3. 1 1
      finder/finder.go
  4. 2 2
      finder/finder_test.go
  5. 2 2
      finder/fs/Android.bp
  6. 0 0
      finder/fs/fs.go
  7. 0 0
      finder/fs/fs_darwin.go
  8. 0 0
      finder/fs/fs_linux.go
  9. 1 1
      ui/build/finder.go

+ 1 - 1
finder/Android.bp

@@ -30,7 +30,7 @@ bootstrap_go_package {
         "finder_test.go",
     ],
     deps: [
-      "soong-fs",
+      "soong-finder-fs",
     ],
 }
 

+ 1 - 1
finder/cmd/finder.go

@@ -28,7 +28,7 @@ import (
 	"time"
 
 	"android/soong/finder"
-	"android/soong/fs"
+	"android/soong/finder/fs"
 )
 
 var (

+ 1 - 1
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

+ 2 - 2
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

+ 2 - 2
fs/Android.bp → 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",
     ],

+ 0 - 0
fs/fs.go → finder/fs/fs.go


+ 0 - 0
fs/fs_darwin.go → finder/fs/fs_darwin.go


+ 0 - 0
fs/fs_linux.go → finder/fs/fs_linux.go


+ 1 - 1
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"