Revert "Initial implementation of the bazel sandwich"
Revert submission 2651299-bazel_sandwich Reason for revert: b/293883239, checking if this breaks the build. Reverted changes: /q/submissionid:2651299-bazel_sandwich Change-Id: I5f1d4bb13d21e6599f5c353dcaba2375f5ec234d
This commit is contained in:
committed by
Gerrit Code Review
parent
a20d947329
commit
c13fad8181
@@ -1029,16 +1029,16 @@ func (p basePath) withRel(rel string) basePath {
|
||||
return p
|
||||
}
|
||||
|
||||
func (p basePath) RelativeToTop() Path {
|
||||
ensureTestOnly()
|
||||
return p
|
||||
}
|
||||
|
||||
// SourcePath is a Path representing a file path rooted from SrcDir
|
||||
type SourcePath struct {
|
||||
basePath
|
||||
}
|
||||
|
||||
func (p SourcePath) RelativeToTop() Path {
|
||||
ensureTestOnly()
|
||||
return p
|
||||
}
|
||||
|
||||
var _ Path = SourcePath{}
|
||||
|
||||
func (p SourcePath) withRel(rel string) SourcePath {
|
||||
@@ -1126,16 +1126,6 @@ func PathForSource(ctx PathContext, pathComponents ...string) SourcePath {
|
||||
return path
|
||||
}
|
||||
|
||||
// PathForArbitraryOutput creates a path for the given components. Unlike PathForOutput,
|
||||
// the path is relative to the root of the output folder, not the out/soong folder.
|
||||
func PathForArbitraryOutput(ctx PathContext, pathComponents ...string) Path {
|
||||
p, err := validatePath(pathComponents...)
|
||||
if err != nil {
|
||||
reportPathError(ctx, err)
|
||||
}
|
||||
return basePath{path: filepath.Join(ctx.Config().OutDir(), p)}
|
||||
}
|
||||
|
||||
// MaybeExistentPathForSource joins the provided path components and validates that the result
|
||||
// neither escapes the source dir nor is in the out dir.
|
||||
// It does not validate whether the path exists.
|
||||
|
Reference in New Issue
Block a user