diff options
author | Colin Cross <ccross@android.com> | 2017-12-14 11:23:47 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-12-14 12:28:41 -0800 |
commit | 3ce001aa40d29b913f2942024eba34f949ec7f3a (patch) | |
tree | 98a868feefbc0af6467a1d10eac0f7ef190edcd4 /androidmk | |
parent | e1731a580334cce7fc36dfc01f9ecf8f5a9396fb (diff) | |
download | build_soong-3ce001aa40d29b913f2942024eba34f949ec7f3a.tar.gz build_soong-3ce001aa40d29b913f2942024eba34f949ec7f3a.tar.bz2 build_soong-3ce001aa40d29b913f2942024eba34f949ec7f3a.zip |
Support more all-*-files-under functions in androidmk
Add support for all-aidl-files-under, all-Iaidl-files-under,
and all-logtags-files-under to android.mk
Test: manual
Change-Id: I5e187e0c5f9d1c63c8632f84ab47665ba85a5678
Diffstat (limited to 'androidmk')
-rw-r--r-- | androidmk/cmd/androidmk/android.go | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 12546215..c6e90f00 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -637,22 +637,15 @@ func mydir(args []string) string { return "." } -func allJavaFilesUnder(args []string) string { - dir := "" - if len(args) > 0 { - dir = strings.TrimSpace(args[0]) - } - - return fmt.Sprintf("%s/**/*.java", dir) -} +func allFilesUnder(wildcard string) func(args []string) string { + return func(args []string) string { + dir := "" + if len(args) > 0 { + dir = strings.TrimSpace(args[0]) + } -func allProtoFilesUnder(args []string) string { - dir := "" - if len(args) > 0 { - dir = strings.TrimSpace(args[0]) + return fmt.Sprintf("%s/**/"+wildcard, dir) } - - return fmt.Sprintf("%s/**/*.proto", dir) } func allSubdirJavaFiles(args []string) string { @@ -696,8 +689,11 @@ func androidScope() mkparser.Scope { 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) |