netbird/gomobile-tvos-fork
0
0
Fork 0
mirror of https://github.com/netbirdio/gomobile-tvos-fork.git synced 2026-05-22 18:43:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

cmd: fix handling of (multiple) tags

Browse Source 
The gomobile tool mishandled build tags in two ways, first by
ignoring tags for iOS, second by passing multiple tags along to
the go tool incorrectly. This CL fixes both.

Fixes golang/go#18523
Fixes golang/go#18515

Change-Id: I28a49c1e23670adb085617d9f5fb5cd5e22a4b65
Reviewed-on: https://go-review.googlesource.com/34955
Reviewed-by: David Crawshaw <crawshaw@golang.org>
This commit is contained in:
Elias Naur
2017-01-12 22:00:16 +00:00
parent 82c03f1188
commit 9ec2d17db2
11 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bind/java/SeqTest.java
+4
View File
@@ -581,4 +581,8 @@ public class SeqTest extends InstrumentationTestCase {
public void testSIGPIPE() {
Testpkg.testSIGPIPE();
}
public void testTags() {
assertEquals("Constant from a tagged file", 42, Testpkg.TaggedConst);
}
}
bind/java/seq_test.go
+4 -4
View File
@@ -106,12 +106,12 @@ func runTest(t *testing.T, pkgNames []string, javaPkg, javaCls string) {
}
}
cmd := []string{"gomobile", "bind", "-o", "pkg.aar"}
args := []string{"bind", "-tags", "aaa bbb", "-o", "pkg.aar"}
if javaPkg != "" {
cmd = append(cmd, "-javapkg", javaPkg)
args = append(args, "-javapkg", javaPkg)
}
cmd = append(cmd, pkgNames...)
buf, err := run(strings.Join(cmd, " "))
args = append(args, pkgNames...)
buf, err := exec.Command("gomobile", args...).CombinedOutput()
if err != nil {
t.Logf("%s", buf)
t.Fatalf("failed to run gomobile bind: %v", err)