Move podcvd and libcfcontainer from frontend/src/ to container/src/

0405ysj · 0405ysj · commit 4fb84508443a · 2026-03-03T08:47:29.000Z
diff --git a/.github/workflows/presubmit.yaml b/.github/workflows/presubmit.yaml
@@ -75,12 +75,12 @@ jobs:
       matrix:
         dir:
           - "e2etests"
+          - "container/src/libcfcontainer"
+          - "container/src/podcvd"
           - "frontend/src/host_orchestrator"
-          - "frontend/src/libcfcontainer"
           - "frontend/src/libhoclient"
           - "frontend/src/liboperator"
           - "frontend/src/operator"
-          - "frontend/src/podcvd"
           - "tools/baseimage"
     steps:
     - name: Checkout repository
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,8 @@ cuttlefish-*_*.*.*.tar.xz
 /*/debian/debhelper-build-stamp
 /*/debian/*.log
 
+container/src/podcvd/podcvd
+
 frontend/src/operator/webui/src/environments/version.ts
 
 /bazel-*
diff --git a/container/src/libcfcontainer/cuttlefish_container.go b/container/src/libcfcontainer/cuttlefish_container.go
@@ -205,7 +205,7 @@ func (m *CuttlefishContainerManagerImpl) ExecOnContainer(ctx context.Context, ct
 func (m *CuttlefishContainerManagerImpl) StopAndRemoveContainer(ctx context.Context, ctr string) error {
 	timeout := int(30)
 	stopConfig := container.StopOptions{
-		Signal: "SIGKILL",
+		Signal:  "SIGKILL",
 		Timeout: &timeout,
 	}
 	if err := m.cli.ContainerStop(ctx, ctr, stopConfig); err != nil {
diff --git a/container/src/libcfcontainer/go.mod b/container/src/libcfcontainer/go.mod
@@ -1,4 +1,4 @@
-module github.com/google/android-cuttlefish/frontend/src/libcfcontainer
+module github.com/google/android-cuttlefish/container/src/libcfcontainer
 
 go 1.24.0
 
diff --git a/container/src/libcfcontainer/go.sum b/container/src/libcfcontainer/go.sum
diff --git a/container/src/podcvd/README.md b/container/src/podcvd/README.md
@@ -8,7 +8,7 @@ podcvd is experimental project. A lot of features may be unstable today.
 
 ```bash
 cd /path/to/android-cuttlefish
-cd frontend/src/podcvd
+cd container/src/podcvd
 go build .
 ```
 
diff --git a/container/src/podcvd/go.mod b/container/src/podcvd/go.mod
@@ -1,12 +1,12 @@
-module github.com/google/android-cuttlefish/frontend/src/podcvd
+module github.com/google/android-cuttlefish/container/src/podcvd
 
 go 1.24.0
 
 toolchain go1.24.8
 
-replace github.com/google/android-cuttlefish/frontend/src/libcfcontainer => ../libcfcontainer
+replace github.com/google/android-cuttlefish/container/src/libcfcontainer => ../libcfcontainer
 
-require github.com/google/android-cuttlefish/frontend/src/libcfcontainer v0.0.0-00010101000000-000000000000
+require github.com/google/android-cuttlefish/container/src/libcfcontainer v0.0.0-00010101000000-000000000000
 
 require (
 	dario.cat/mergo v1.0.2 // indirect
diff --git a/container/src/podcvd/go.sum b/container/src/podcvd/go.sum
diff --git a/container/src/podcvd/internal/adb.go b/container/src/podcvd/internal/adb.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"os/exec"
 
-	"github.com/google/android-cuttlefish/frontend/src/libcfcontainer"
+	"github.com/google/android-cuttlefish/container/src/libcfcontainer"
 )
 
 func ConnectAdb(ccm libcfcontainer.CuttlefishContainerManager, instanceGroup InstanceGroup) error {
diff --git a/container/src/podcvd/internal/const.go b/container/src/podcvd/internal/const.go
diff --git a/container/src/podcvd/internal/cvd.go b/container/src/podcvd/internal/cvd.go
diff --git a/container/src/podcvd/internal/host.go b/container/src/podcvd/internal/host.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/android-cuttlefish/frontend/src/libcfcontainer"
+	"github.com/google/android-cuttlefish/container/src/libcfcontainer"
 
 	"github.com/containerd/errdefs"
 	"github.com/docker/docker/api/types/container"
diff --git a/container/src/podcvd/internal/parser.go b/container/src/podcvd/internal/parser.go
diff --git a/container/src/podcvd/internal/util.go b/container/src/podcvd/internal/util.go
@@ -19,7 +19,7 @@ import (
 	"crypto/sha256"
 	"fmt"
 
-	"github.com/google/android-cuttlefish/frontend/src/libcfcontainer"
+	"github.com/google/android-cuttlefish/container/src/libcfcontainer"
 
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
diff --git a/container/src/podcvd/main.go b/container/src/podcvd/main.go
@@ -23,8 +23,8 @@ import (
 	"os"
 	"sync"
 
-	"github.com/google/android-cuttlefish/frontend/src/libcfcontainer"
-	"github.com/google/android-cuttlefish/frontend/src/podcvd/internal"
+	"github.com/google/android-cuttlefish/container/src/libcfcontainer"
+	"github.com/google/android-cuttlefish/container/src/podcvd/internal"
 )
 
 func disconnectAdb(ccm libcfcontainer.CuttlefishContainerManager, groupName string) error {
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -1,4 +1,3 @@
 /src/host_orchestrator/host_orchestrator
-/src/podcvd/podcvd
 /src/cvdserver_bootstrapper/cvdserver_bootstrapper
 /src/operator/operator

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ func (m *CuttlefishContainerManagerImpl) ExecOnContainer(ctx context.Context, ct`
`205`	`205`	`func (m *CuttlefishContainerManagerImpl) StopAndRemoveContainer(ctx context.Context, ctr string) error {`
`206`	`206`	`timeout := int(30)`
`207`	`207`	`stopConfig := container.StopOptions{`
`208`		`- Signal: "SIGKILL",`
	`208`	`+ Signal: "SIGKILL",`
`209`	`209`	`Timeout: &timeout,`
`210`	`210`	`}`
`211`	`211`	`if err := m.cli.ContainerStop(ctx, ctr, stopConfig); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/google/android-cuttlefish/frontend/src/libcfcontainer`
	`1`	`+module github.com/google/android-cuttlefish/container/src/libcfcontainer`
`2`	`2`
`3`	`3`	`go 1.24.0`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`"fmt"`
`19`	`19`	`"os/exec"`
`20`	`20`
`21`		`- "github.com/google/android-cuttlefish/frontend/src/libcfcontainer"`
	`21`	`+ "github.com/google/android-cuttlefish/container/src/libcfcontainer"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func ConnectAdb(ccm libcfcontainer.CuttlefishContainerManager, instanceGroup InstanceGroup) error {`