From d0a3da2d88ed9f4cc2e2ae4387a1ec9236ef760c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 15 Apr 2015 12:29:45 -0700 Subject: [PATCH] androidmk: add all-subdir-java-files Change-Id: I7f3458231abcf7fb03595bb0f9277a0820ceb4f7 --- androidmk/cmd/androidmk/android.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 404aed80f..9396afe35 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -117,6 +117,10 @@ func allJavaFilesUnder(args []string) string { return fmt.Sprintf("%s/**/*.java", dir) } +func allSubdirJavaFiles(args []string) string { + return "**/*.java" +} + var moduleTypes = map[string]string{ "BUILD_SHARED_LIBRARY": "cc_library_shared", "BUILD_STATIC_LIBRARY": "cc_library_static", @@ -142,6 +146,7 @@ func androidScope() parser.Scope { globalScope.Set("CLEAR_VARS", clear_vars) globalScope.SetFunc("my-dir", mydir) globalScope.SetFunc("all-java-files-under", allJavaFilesUnder) + globalScope.SetFunc("all-subdir-java-files", allSubdirJavaFiles) for k, v := range moduleTypes { globalScope.Set(k, v)