6e18ca49f8
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
71 lines
1.9 KiB
Go
71 lines
1.9 KiB
Go
// Copyright 2015 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package java
|
|
|
|
import (
|
|
"path/filepath"
|
|
|
|
"android/soong/common"
|
|
)
|
|
|
|
var resourceExcludes = []string{
|
|
"**/*.java",
|
|
"**/package.html",
|
|
"**/overview.html",
|
|
"**/.*.swp",
|
|
"**/.DS_Store",
|
|
"**/*~",
|
|
}
|
|
|
|
func isStringInSlice(str string, slice []string) bool {
|
|
for _, s := range slice {
|
|
if s == str {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func ResourceDirsToJarSpecs(ctx common.AndroidModuleContext, resourceDirs, excludeDirs []string) []jarSpec {
|
|
var excludes []string
|
|
|
|
for _, exclude := range excludeDirs {
|
|
excludes = append(excludes, filepath.Join(common.ModuleSrcDir(ctx), exclude, "**/*"))
|
|
}
|
|
|
|
excludes = append(excludes, resourceExcludes...)
|
|
|
|
var jarSpecs []jarSpec
|
|
|
|
for _, resourceDir := range resourceDirs {
|
|
if isStringInSlice(resourceDir, excludeDirs) {
|
|
continue
|
|
}
|
|
resourceDir := filepath.Join(common.ModuleSrcDir(ctx), resourceDir)
|
|
dirs := ctx.Glob("java_resources", resourceDir, nil)
|
|
for _, dir := range dirs {
|
|
relDir := common.SrcDirRelPath(ctx, dir)
|
|
fileListFile := filepath.Join(common.ModuleOutDir(ctx), "res", relDir, "resources.list")
|
|
depFile := fileListFile + ".d"
|
|
|
|
glob := filepath.Join(dir, "**/*")
|
|
common.GlobRule(ctx, glob, excludes, fileListFile, depFile)
|
|
jarSpecs = append(jarSpecs, jarSpec{fileListFile, dir})
|
|
}
|
|
}
|
|
|
|
return jarSpecs
|
|
}
|