diff options
| author | Colin Cross <ccross@android.com> | 2015-04-07 16:50:10 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-04-08 15:17:45 -0700 |
| commit | 581c18998830a44c20b8932935a2f32442bd8e80 (patch) | |
| tree | df97714ae7d8fbb63ab4f36cf96ed3f7cdad58bd /common | |
| parent | 65bf4f231c9407a0f53c7c2b9237d0b219032231 (diff) | |
| download | build_soong-581c18998830a44c20b8932935a2f32442bd8e80.tar.gz build_soong-581c18998830a44c20b8932935a2f32442bd8e80.tar.bz2 build_soong-581c18998830a44c20b8932935a2f32442bd8e80.zip | |
Add yacc and lex support
Add support for yacc (.y or .yy) and lex (.l or .ll) files. Also
tweak locations of .o files for normal and generated sources to
makes sure they don't collide.
Change-Id: I03172cddbdc022525bf392a81d72050406b8cdb3
Diffstat (limited to 'common')
| -rw-r--r-- | common/module.go | 1 | ||||
| -rw-r--r-- | common/paths.go | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/common/module.go b/common/module.go index c008d7de..e61d3131 100644 --- a/common/module.go +++ b/common/module.go @@ -23,6 +23,7 @@ import ( type Config interface { CpPreserveSymlinksFlags() string SrcDir() string + IntermediatesDir() string Getenv(string) string EnvDeps() map[string]string DeviceOut() string diff --git a/common/paths.go b/common/paths.go index abe67bf5..b052feff 100644 --- a/common/paths.go +++ b/common/paths.go @@ -22,7 +22,8 @@ import ( // ModuleOutDir returns the path to the module-specific output directory. func ModuleOutDir(ctx AndroidModuleContext) string { - return filepath.Join(".intermediates", ctx.ModuleDir(), ctx.ModuleName(), ctx.ModuleSubDir()) + config := ctx.Config().(Config) + return filepath.Join(config.IntermediatesDir(), ctx.ModuleDir(), ctx.ModuleName(), ctx.ModuleSubDir()) } // ModuleSrcDir returns the path of the directory that all source file paths are |