Revert "Add Android.bp.list and soong.variables to inputs for soong_docs action"
This reverts commit 67eee7cae4dc1085d016f47515e9e4b15ab3aba4.
Reason for revert: Broke renderscript build
Change-Id: Ie26b3c7a78afe44d719f399520e643174109593f
diff --git a/android/config.go b/android/config.go
index 58a1dd2..b906108 100644
--- a/android/config.go
+++ b/android/config.go
@@ -93,9 +93,8 @@
deviceConfig *deviceConfig
- srcDir string // the path of the root source directory
- buildDir string // the path of the build output directory
- moduleListFile string // the path to the file which lists blueprint files to parse.
+ srcDir string // the path of the root source directory
+ buildDir string // the path of the build output directory
env map[string]string
envLock sync.Mutex
@@ -317,7 +316,7 @@
// New creates a new Config object. The srcDir argument specifies the path to
// the root source directory. It also loads the config file, if found.
-func NewConfig(srcDir, buildDir string, moduleListFile string) (Config, error) {
+func NewConfig(srcDir, buildDir string) (Config, error) {
// Make a config with default options
config := &config{
ConfigFileName: filepath.Join(buildDir, configFileName),
@@ -329,8 +328,7 @@
buildDir: buildDir,
multilibConflicts: make(map[ArchType]bool),
- moduleListFile: moduleListFile,
- fs: pathtools.NewOsFs(absSrcDir),
+ fs: pathtools.NewOsFs(absSrcDir),
}
config.deviceConfig = &deviceConfig{
diff --git a/android/paths.go b/android/paths.go
index 724bbd0..bed6f3f 100644
--- a/android/paths.go
+++ b/android/paths.go
@@ -904,27 +904,6 @@
var _ Path = OutputPath{}
var _ WritablePath = OutputPath{}
-// toolDepPath is a Path representing a dependency of the build tool.
-type toolDepPath struct {
- basePath
-}
-
-var _ Path = toolDepPath{}
-
-// pathForBuildToolDep joins the provided paths and returns a toolDepPath that
-// is validated to not contain invalid characters.
-// There is no validation for the base directory of the constructed path.
-// Only use this function to construct paths for depenencies of the build
-// tool invocation.
-// On error, it will return a usable, but invalid toolDepPath, and report a ModuleError.
-func pathForBuildToolDep(ctx PathContext, pathComponents ...string) toolDepPath {
- path, err := validatePath(pathComponents...)
- if err != nil {
- reportPathError(ctx, err)
- }
- return toolDepPath{basePath{path, ctx.Config(), ""}}
-}
-
// PathForOutput joins the provided paths and returns an OutputPath that is
// validated to not escape the build dir.
// On error, it will return a usable, but invalid OutputPath, and report a ModuleError.
diff --git a/android/writedocs.go b/android/writedocs.go
index 4eb15e6..9e43e80 100644
--- a/android/writedocs.go
+++ b/android/writedocs.go
@@ -44,10 +44,6 @@
}
func (c *docsSingleton) GenerateBuildActions(ctx SingletonContext) {
- var deps Paths
- deps = append(deps, pathForBuildToolDep(ctx, ctx.Config().moduleListFile))
- deps = append(deps, pathForBuildToolDep(ctx, ctx.Config().ProductVariablesFileName))
-
// Generate build system docs for the primary builder. Generating docs reads the source
// files used to build the primary builder, but that dependency will be picked up through
// the dependency on the primary builder itself. There are no dependencies on the
@@ -67,7 +63,6 @@
ctx.Build(pctx, BuildParams{
Rule: soongDocs,
Output: docsFile,
- Inputs: deps,
Args: map[string]string{
"outDir": PathForOutput(ctx, "docs").String(),
},
diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go
index 532d9e4..905f206 100644
--- a/cmd/soong_build/main.go
+++ b/cmd/soong_build/main.go
@@ -59,7 +59,7 @@
ctx := android.NewContext()
ctx.Register()
- configuration, err := android.NewConfig(srcDir, bootstrap.BuildDir, bootstrap.ModuleListFile)
+ configuration, err := android.NewConfig(srcDir, bootstrap.BuildDir)
if err != nil {
fmt.Fprintf(os.Stderr, "%s", err)
os.Exit(1)
diff --git a/ui/build/test_build.go b/ui/build/test_build.go
index 83b3807..4ff9483 100644
--- a/ui/build/test_build.go
+++ b/ui/build/test_build.go
@@ -66,8 +66,6 @@
outDir := config.OutDir()
bootstrapDir := filepath.Join(outDir, "soong", ".bootstrap")
miniBootstrapDir := filepath.Join(outDir, "soong", ".minibootstrap")
- modulePathsDir := filepath.Join(outDir, ".module_paths")
- variablesFilePath := filepath.Join(outDir, "soong", "soong.variables")
danglingRules := make(map[string]bool)
@@ -78,10 +76,7 @@
// Leaf node is not in the out directory.
continue
}
- if strings.HasPrefix(line, bootstrapDir) ||
- strings.HasPrefix(line, miniBootstrapDir) ||
- strings.HasPrefix(line, modulePathsDir) ||
- line == variablesFilePath {
+ if strings.HasPrefix(line, bootstrapDir) || strings.HasPrefix(line, miniBootstrapDir) {
// Leaf node is in one of Soong's bootstrap directories, which do not have
// full build rules in the primary build.ninja file.
continue