]> Cypherpunks repositories - gostls13.git/commit
projects / gostls13.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 5ee1d5d) | patch
cmd/go: recognize android suffix when constructing build list
authorJay Conrod <jayconrod@google.com>
Tue, 19 Mar 2019 20:36:21 +0000 (16:36 -0400)
committerJay Conrod <jayconrod@google.com>
Thu, 28 Mar 2019 23:36:30 +0000 (23:36 +0000)
commitf07a99e30a86e302724fbcb189defd5ebb80b8df
treea3ef922743c8037b047b763fd4f397fbfd75ae0atree
parent5ee1d5d39f0c802be0de31533042ddc3871a0b1ecommit | diff
cmd/go: recognize android suffix when constructing build list

cmd/go/internal/imports.ScanDir extracts a list of imports from a
directory. It's used instead of go/build.ImportDir when constructing
the build list. GOOS and GOARCH may be used to filter files.

With this change, imports.MatchFile understands that when the
"android" tag is set, the "linux" tag is implied.

Fixes #30888

Change-Id: Ia29bd1590b69c9183ab14a879d5fc1b639f8eaef
Reviewed-on: https://go-review.googlesource.com/c/go/+/168378
Run-TryBot: Jay Conrod <jayconrod@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
17 files changed:
src/cmd/go/internal/imports/build.go diff | blob | history
src/cmd/go/internal/imports/scan_test.go diff | blob | history
src/cmd/go/internal/imports/testdata/android/a_android.go [new file with mode: 0644] blob
src/cmd/go/internal/imports/testdata/android/b_android_arm64.go [new file with mode: 0644] blob
src/cmd/go/internal/imports/testdata/android/c_linux.go [new file with mode: 0644] blob
src/cmd/go/internal/imports/testdata/android/d_linux_arm64.go [new file with mode: 0644] blob
src/cmd/go/internal/imports/testdata/android/e.go [new file with mode: 0644] blob
src/cmd/go/internal/imports/testdata/android/f.go [new file with mode: 0644] blob
src/cmd/go/internal/imports/testdata/android/g.go [new file with mode: 0644] blob
src/cmd/go/internal/imports/testdata/android/tags.txt [new file with mode: 0644] blob
src/cmd/go/internal/imports/testdata/android/want.txt [new file with mode: 0644] blob
src/cmd/go/internal/imports/testdata/star/tags.txt [new file with mode: 0644] blob
src/cmd/go/internal/imports/testdata/star/want.txt [new file with mode: 0644] blob
src/cmd/go/internal/imports/testdata/star/x.go [moved from src/cmd/go/internal/imports/testdata/import1/x.go with 100% similarity] blob | history
src/cmd/go/internal/imports/testdata/star/x1.go [moved from src/cmd/go/internal/imports/testdata/import1/x1.go with 100% similarity] blob | history
src/cmd/go/internal/imports/testdata/star/x_darwin.go [moved from src/cmd/go/internal/imports/testdata/import1/x_darwin.go with 100% similarity] blob | history
src/cmd/go/internal/imports/testdata/star/x_windows.go [moved from src/cmd/go/internal/imports/testdata/import1/x_windows.go with 100% similarity] blob | history
Go GOST TLS 1.3