platform_build_soong/java/resources.go
Colin Cross 0532fb0d4c Fix excluding resource directories
Using a glob as a path failed the existence check.  Append the
glob after converting the path to a string.

Test: TestExcludeResources in java_test.go
Change-Id: Ic1fd40aa283f3b0d59c1c589dbeec411583eddf1
2017-10-03 02:13:16 +00:00

93 lines
2.4 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 (
"fmt"
"path/filepath"
"strings"
"github.com/google/blueprint/bootstrap"
"android/soong/android"
)
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 ResourceDirsToJarArgs(ctx android.ModuleContext,
resourceDirs, excludeDirs []string) (args []string, deps android.Paths) {
var excludes []string
for _, exclude := range excludeDirs {
excludes = append(excludes,
filepath.Join(android.PathForModuleSrc(ctx, exclude).String(), "**/*"))
}
excludes = append(excludes, resourceExcludes...)
for _, resourceDir := range resourceDirs {
if isStringInSlice(resourceDir, excludeDirs) {
continue
}
resourceDir := android.PathForModuleSrc(ctx, resourceDir)
dirs := ctx.Glob(resourceDir.String(), nil)
for _, dir := range dirs {
fileListFile := android.ResPathWithName(ctx, dir, "resources.list")
depFile := fileListFile.String() + ".d"
pattern := filepath.Join(dir.String(), "**/*")
bootstrap.GlobFile(ctx, pattern, excludes, fileListFile.String(), depFile)
args = append(args,
"-C", dir.String(),
"-l", fileListFile.String())
deps = append(deps, fileListFile)
}
}
return args, deps
}
func ResourceFilesToJarArgs(ctx android.ModuleContext,
res, exclude []string) (args []string, deps android.Paths) {
files := ctx.ExpandSources(res, exclude)
for _, f := range files {
rel := f.Rel()
path := f.String()
if !strings.HasSuffix(path, rel) {
panic(fmt.Errorf("path %q does not end with %q", path, rel))
}
path = filepath.Clean(strings.TrimSuffix(path, rel))
args = append(args, "-C", filepath.Clean(path), "-f", f.String())
}
return args, files
}