diff options
author | Jeff Gaston <jeffrygaston@google.com> | 2017-11-27 16:06:40 -0800 |
---|---|---|
committer | Jeff Gaston <jeffrygaston@google.com> | 2017-11-28 14:24:24 -0800 |
commit | 0d83b8c9fe6564fc5611fc93214b16bd34eb500b (patch) | |
tree | a97b58d3373a323de3aa5fa2dc908c82ed3f7327 /androidmk/cmd | |
parent | b4972e3d96b62e5fe0052efda6a400a6ef8e4184 (diff) | |
download | build_soong-0d83b8c9fe6564fc5611fc93214b16bd34eb500b.tar.gz build_soong-0d83b8c9fe6564fc5611fc93214b16bd34eb500b.tar.bz2 build_soong-0d83b8c9fe6564fc5611fc93214b16bd34eb500b.zip |
Have androidmk ignore all-makefiles-under
That's automatically implemented now by the finder
Bug: b/37748825
Test: m -j nothing # which runs unit tests
Change-Id: Ie17907733a744dc97cd24c90bed73b4731e878ad
Diffstat (limited to 'androidmk/cmd')
-rw-r--r-- | androidmk/cmd/androidmk/android.go | 11 | ||||
-rw-r--r-- | androidmk/cmd/androidmk/androidmk.go | 3 | ||||
-rw-r--r-- | androidmk/cmd/androidmk/androidmk_test.go | 7 |
3 files changed, 20 insertions, 1 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index df01cf4a..73ea4ac0 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -24,7 +24,8 @@ import ( ) const ( - clear_vars = "__android_mk_clear_vars" + clear_vars = "__android_mk_clear_vars" + include_ignored = "__android_mk_include_ignored" ) type bpVariable struct { @@ -693,6 +694,10 @@ func allSubdirJavaFiles(args []string) string { return "**/*.java" } +func includeIgnored(args []string) string { + return include_ignored +} + var moduleTypes = map[string]string{ "BUILD_SHARED_LIBRARY": "cc_library_shared", "BUILD_STATIC_LIBRARY": "cc_library_static", @@ -729,6 +734,10 @@ func androidScope() mkparser.Scope { globalScope.SetFunc("all-java-files-under", allJavaFilesUnder) globalScope.SetFunc("all-proto-files-under", allProtoFilesUnder) globalScope.SetFunc("all-subdir-java-files", allSubdirJavaFiles) + globalScope.SetFunc("all-makefiles-under", includeIgnored) + globalScope.SetFunc("first-makefiles-under", includeIgnored) + globalScope.SetFunc("all-named-subdir-makefiles", includeIgnored) + globalScope.SetFunc("all-subdir-makefiles", includeIgnored) for k, v := range moduleTypes { globalScope.Set(k, v) diff --git a/androidmk/cmd/androidmk/androidmk.go b/androidmk/cmd/androidmk/androidmk.go index 660d9a01..385690c2 100644 --- a/androidmk/cmd/androidmk/androidmk.go +++ b/androidmk/cmd/androidmk/androidmk.go @@ -177,6 +177,9 @@ func convertFile(filename string, buffer *bytes.Buffer) (string, []error) { makeModule(file, val) case val == clear_vars: resetModule(file) + case val == include_ignored: + // subdirs are already automatically included in Soong + continue default: file.errorf(x, "unsupported include") continue diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go index 0b865409..9986889c 100644 --- a/androidmk/cmd/androidmk/androidmk_test.go +++ b/androidmk/cmd/androidmk/androidmk_test.go @@ -460,6 +460,13 @@ endif # b==false // endif `, }, + { + desc: "ignore all-makefiles-under", + in: ` +include $(call all-makefiles-under,$(LOCAL_PATH)) +`, + expected: ``, + }, } func reformatBlueprint(input string) string { |