openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Colin Cross 2015-07-14 18:55:36 -07:00
parent cbac5fbe78
commit 6e18ca49f8
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cc/gen.go
View File

@ -20,7 +20,6 @@ package cc
import (
"path/filepath"
"strings"
"github.com/google/blueprint"
"github.com/google/blueprint/pathtools"
@ -51,7 +50,7 @@ var (
)
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 genYacc(ctx common.AndroidModuleContext, yaccFile, yaccFlags string) (cppFi
}
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")

13
common/paths.go
View File

@ -15,6 +15,7 @@
package common
import (
"fmt"
"os"
"path/filepath"
)
@ -105,3 +106,15 @@ func CheckSrcDirsExist(ctx AndroidModuleContext, dirs []string, prop string) {
}
}
}
// 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
}

5
java/gen.go
View File

@ -20,7 +20,6 @@ package java
import (
"path/filepath"
"strings"
"github.com/google/blueprint"
"github.com/google/blueprint/pathtools"
@ -63,7 +62,7 @@ var (
)
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 genAidl(ctx common.AndroidModuleContext, aidlFile, aidlFlags string) string
}
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")

3
java/resources.go
View File

@ -56,7 +56,8 @@ func ResourceDirsToJarSpecs(ctx common.AndroidModuleContext, resourceDirs, exclu
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, "**/*")