Merge "Support more all-*-files-under functions in androidmk"
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 1254621..c6e90f0 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -637,22 +637,15 @@
return "."
}
-func allJavaFilesUnder(args []string) string {
- dir := ""
- if len(args) > 0 {
- dir = strings.TrimSpace(args[0])
+func allFilesUnder(wildcard string) func(args []string) string {
+ return func(args []string) string {
+ dir := ""
+ if len(args) > 0 {
+ dir = strings.TrimSpace(args[0])
+ }
+
+ return fmt.Sprintf("%s/**/"+wildcard, dir)
}
-
- return fmt.Sprintf("%s/**/*.java", dir)
-}
-
-func allProtoFilesUnder(args []string) string {
- dir := ""
- if len(args) > 0 {
- dir = strings.TrimSpace(args[0])
- }
-
- return fmt.Sprintf("%s/**/*.proto", dir)
}
func allSubdirJavaFiles(args []string) string {
@@ -696,8 +689,11 @@
globalScope := mkparser.NewScope(nil)
globalScope.Set("CLEAR_VARS", clear_vars)
globalScope.SetFunc("my-dir", mydir)
- globalScope.SetFunc("all-java-files-under", allJavaFilesUnder)
- globalScope.SetFunc("all-proto-files-under", allProtoFilesUnder)
+ globalScope.SetFunc("all-java-files-under", allFilesUnder("*.java"))
+ globalScope.SetFunc("all-proto-files-under", allFilesUnder("*.proto"))
+ globalScope.SetFunc("all-aidl-files-under", allFilesUnder("*.aidl"))
+ globalScope.SetFunc("all-Iaidl-files-under", allFilesUnder("I*.aidl"))
+ globalScope.SetFunc("all-logtags-files-under", allFilesUnder("*.logtags"))
globalScope.SetFunc("all-subdir-java-files", allSubdirJavaFiles)
globalScope.SetFunc("all-makefiles-under", includeIgnored)
globalScope.SetFunc("first-makefiles-under", includeIgnored)