Fix java resource glob file list location
The source path was being appended to the module out directory
to create the file list file, which was resulting in .. in the
source path moving the file list file up the directory tree.
Use SrcDirRelPath to convert the globbed resource directories
to be relatiave to $srcDir before appending them.
Also do the same fix to generated aidl, logtags, yacc, and lex
files.
Change-Id: I2e636bd30abf03bc1d80a897951a9812cc3e09ef
diff --git a/cc/gen.go b/cc/gen.go
index bd91d64..3bfe679 100644
--- a/cc/gen.go
+++ b/cc/gen.go
@@ -20,7 +20,6 @@
import (
"path/filepath"
- "strings"
"github.com/google/blueprint"
"github.com/google/blueprint/pathtools"
@@ -51,7 +50,7 @@
)
func genYacc(ctx common.AndroidModuleContext, yaccFile, yaccFlags string) (cppFile, headerFile string) {
- cppFile = strings.TrimPrefix(yaccFile, common.ModuleSrcDir(ctx))
+ cppFile = common.SrcDirRelPath(ctx, yaccFile)
cppFile = filepath.Join(common.ModuleGenDir(ctx), cppFile)
cppFile = pathtools.ReplaceExtension(cppFile, "cpp")
hppFile := pathtools.ReplaceExtension(cppFile, "hpp")
@@ -74,7 +73,7 @@
}
func genLex(ctx common.AndroidModuleContext, lexFile string) (cppFile string) {
- cppFile = strings.TrimPrefix(lexFile, common.ModuleSrcDir(ctx))
+ cppFile = common.SrcDirRelPath(ctx, lexFile)
cppFile = filepath.Join(common.ModuleGenDir(ctx), cppFile)
cppFile = pathtools.ReplaceExtension(cppFile, "cpp")
diff --git a/common/paths.go b/common/paths.go
index c4bdfc7..d92dcf9 100644
--- a/common/paths.go
+++ b/common/paths.go
@@ -15,6 +15,7 @@
package common
import (
+ "fmt"
"os"
"path/filepath"
)
@@ -105,3 +106,15 @@
}
}
}
+
+// Returns a path relative to the top level source directory. Panics if path is not inside the
+// top level source directory.
+func SrcDirRelPath(ctx AndroidModuleContext, path string) string {
+ srcDir := ctx.AConfig().SrcDir()
+ relPath, err := filepath.Rel(srcDir, path)
+ if err != nil {
+ panic(fmt.Errorf("%q is not inside %q: %s", path, srcDir, err.Error()))
+ }
+
+ return relPath
+}
diff --git a/java/gen.go b/java/gen.go
index dd86f66..6e8313a 100644
--- a/java/gen.go
+++ b/java/gen.go
@@ -20,7 +20,6 @@
import (
"path/filepath"
- "strings"
"github.com/google/blueprint"
"github.com/google/blueprint/pathtools"
@@ -63,7 +62,7 @@
)
func genAidl(ctx common.AndroidModuleContext, aidlFile, aidlFlags string) string {
- javaFile := strings.TrimPrefix(aidlFile, common.ModuleSrcDir(ctx))
+ javaFile := common.SrcDirRelPath(ctx, aidlFile)
javaFile = filepath.Join(common.ModuleGenDir(ctx), javaFile)
javaFile = pathtools.ReplaceExtension(javaFile, "java")
depFile := javaFile + ".d"
@@ -83,7 +82,7 @@
}
func genLogtags(ctx common.AndroidModuleContext, logtagsFile string) string {
- javaFile := strings.TrimPrefix(logtagsFile, common.ModuleSrcDir(ctx))
+ javaFile := common.SrcDirRelPath(ctx, logtagsFile)
javaFile = filepath.Join(common.ModuleGenDir(ctx), javaFile)
javaFile = pathtools.ReplaceExtension(javaFile, "java")
diff --git a/java/resources.go b/java/resources.go
index 995e60d..405d8b0 100644
--- a/java/resources.go
+++ b/java/resources.go
@@ -56,7 +56,8 @@
resourceDir := filepath.Join(common.ModuleSrcDir(ctx), resourceDir)
dirs := ctx.Glob("java_resources", resourceDir, nil)
for _, dir := range dirs {
- fileListFile := filepath.Join(common.ModuleOutDir(ctx), "res", dir, "resources.list")
+ relDir := common.SrcDirRelPath(ctx, dir)
+ fileListFile := filepath.Join(common.ModuleOutDir(ctx), "res", relDir, "resources.list")
depFile := fileListFile + ".d"
glob := filepath.Join(dir, "**/*")