Remove asset dir glob files
I'm rewriting how globs work in soong to make them compatible with hash-based ninja implementations. As part of this, I'm removing this unnecessary usage of globs to make them simpler. In this case, since we're already globbing the directory at analysis time and causing soong to rerun, we can ensure the aapt2 action also reruns by putting a hash of the glob results onto the command line. Bug: 364749114 Test: m framework-res, touch frameworks/base/core/res/assets/test1.txt, m framework-res rebuilt framework-res.apk, rm frameworks/base/core/res/assets/test1.txt, m framework-res rebuilt framework-res.apk again Change-Id: I4f666367a9a0fd0dfa42dc51ef3a788a02b41747
This commit is contained in:
@@ -16,7 +16,6 @@ package android
|
||||
|
||||
import (
|
||||
"github.com/google/blueprint"
|
||||
"github.com/google/blueprint/bootstrap"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -120,8 +119,3 @@ func init() {
|
||||
return ctx.Config().RBEWrapper()
|
||||
})
|
||||
}
|
||||
|
||||
// GlobToListFileRule creates a rule that writes a list of files matching a pattern to a file.
|
||||
func GlobToListFileRule(ctx ModuleContext, pattern string, excludes []string, file WritablePath) {
|
||||
bootstrap.GlobFile(ctx.blueprintModuleContext(), pattern, excludes, file.String())
|
||||
}
|
||||
|
Reference in New Issue
Block a user