StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "support sandboxed rust rules"

Browse Source 
Revert submission 2629131-sandbox-rust-inputs

Reason for revert: Fail on android build.

Reverted changes: /q/submissionid:2629131-sandbox-rust-inputs

Change-Id: Ifd9aa46e80a12d8f4ffa0a2daa74b96727cbb7e6
This commit is contained in:
Wen-yi Chu
2023-09-22 03:58:59 +00:00
parent df0ed707a5
commit 41326c1f41
28 changed files with 383 additions and 1402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
android/paths.go
View File

@@ -171,9 +171,6 @@ type Path interface {
// Base returns the last element of the path
Base() string
// Dir returns a path pointing the directory containing the path
Dir() Path
// Rel returns the portion of the path relative to the directory it was created from. For
// example, Rel on a PathsForModuleSrc would return the path relative to the module source
// directory, and OutputPath.Join("foo").Rel() would return "foo".
@@ -1015,12 +1012,6 @@ func (p basePath) Base() string {
return filepath.Base(p.path)
}
func (p basePath) Dir() Path {
p.path = filepath.Dir(p.path)
p.rel = filepath.Dir(p.rel)
return p
}
func (p basePath) Rel() string {
if p.rel != "" {
return p.rel
@@ -1055,11 +1046,6 @@ func (p SourcePath) withRel(rel string) SourcePath {
return p
}
func (p SourcePath) Dir() Path {
p.basePath = p.basePath.Dir().(basePath)
return p
}
// safePathForSource is for paths that we expect are safe -- only for use by go
// code that is embedding ninja variables in paths
func safePathForSource(ctx PathContext, pathComponents ...string) (SourcePath, error) {
@@ -1262,12 +1248,6 @@ func (p OutputPath) withRel(rel string) OutputPath {
return p
}
func (p OutputPath) Dir() Path {
p.basePath = p.basePath.Dir().(basePath)
p.fullPath = filepath.Dir(p.fullPath)
return p
}
func (p OutputPath) WithoutRel() OutputPath {
p.basePath.rel = filepath.Base(p.basePath.path)
return p
@@ -1300,11 +1280,6 @@ type toolDepPath struct {
basePath
}
func (p toolDepPath) Dir() Path {
p.basePath = p.basePath.Dir().(basePath)
return p
}
func (t toolDepPath) RelativeToTop() Path {
ensureTestOnly()
return t
@@ -1488,11 +1463,6 @@ type ModuleOutPath struct {
OutputPath
}
func (p ModuleOutPath) Dir() Path {
p.OutputPath = p.OutputPath.Dir().(OutputPath)
return p
}
func (p ModuleOutPath) RelativeToTop() Path {
p.OutputPath = p.outputPathRelativeToTop()
return p
@@ -1537,11 +1507,6 @@ type ModuleGenPath struct {
ModuleOutPath
}
func (p ModuleGenPath) Dir() Path {
p.ModuleOutPath = p.ModuleOutPath.Dir().(ModuleOutPath)
return p
}
func (p ModuleGenPath) RelativeToTop() Path {
p.OutputPath = p.outputPathRelativeToTop()
return p
@@ -1581,11 +1546,6 @@ type ModuleObjPath struct {
ModuleOutPath
}
func (p ModuleObjPath) Dir() Path {
p.ModuleOutPath = p.ModuleOutPath.Dir().(ModuleOutPath)
return p
}
func (p ModuleObjPath) RelativeToTop() Path {
p.OutputPath = p.outputPathRelativeToTop()
return p
@@ -1610,11 +1570,6 @@ type ModuleResPath struct {
ModuleOutPath
}
func (p ModuleResPath) Dir() Path {
p.ModuleOutPath = p.ModuleOutPath.Dir().(ModuleOutPath)
return p
}
func (p ModuleResPath) RelativeToTop() Path {
p.OutputPath = p.outputPathRelativeToTop()
return p
@@ -1651,11 +1606,6 @@ type InstallPath struct {
makePath bool
}
func (p InstallPath) Dir() Path {
p.basePath = p.basePath.Dir().(basePath)
return p
}
// Will panic if called from outside a test environment.
func ensureTestOnly() {
if PrefixInList(os.Args, "-test.") {
@@ -1972,11 +1922,6 @@ type PhonyPath struct {
basePath
}
func (p PhonyPath) Dir() Path {
p.basePath = p.basePath.Dir().(basePath)
return p
}
func (p PhonyPath) writablePath() {}
func (p PhonyPath) getSoongOutDir() string {
@@ -2002,11 +1947,6 @@ type testPath struct {
basePath
}
func (p testPath) Dir() Path {
p.basePath = p.basePath.Dir().(basePath)
return p
}
func (p testPath) RelativeToTop() Path {
ensureTestOnly()
return p