Merge branch 'main' into add-deeplink

Author: inkeliz

gogio/androidbuild.go

@@ -241,7 +241,7 @@ func compileAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err erro
 			return err
 		})
 	}
-	appDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/app/"))
+	appDir, err := runCmd(exec.Command("go", "list", "-tags", bi.tags, "-f", "{{.Dir}}", "gioui.org/app/"))
 	if err != nil {
 		return err
 	}

gogio/build_info.go

@@ -120,11 +120,11 @@ type packageMetadata struct {
 }
 
 func getPkgMetadata(pkgPath string) (*packageMetadata, error) {
-	pkgImportPath, err := runCmd(exec.Command("go", "list", "-f", "{{.ImportPath}}", pkgPath))
+	pkgImportPath, err := runCmd(exec.Command("go", "list", "-tags", *extraTags, "-f", "{{.ImportPath}}", pkgPath))
 	if err != nil {
 		return nil, err
 	}
-	pkgDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", pkgPath))
+	pkgDir, err := runCmd(exec.Command("go", "list", "-tags", *extraTags, "-f", "{{.Dir}}", pkgPath))
 	if err != nil {
 		return nil, err
 	}

gogio/iosbuild.go

@@ -490,16 +490,6 @@ func archiveIOS(tmpDir, target, frameworkRoot string, bi *buildInfo) error {
 	lipo := exec.Command("xcrun", "lipo", "-o", exe, "-create")
 	var builds errgroup.Group
 	tags := bi.tags
-	goos := "ios"
-	supportsIOS, err := supportsGOOS("ios")
-	if err != nil {
-		return err
-	}
-	if !supportsIOS {
-		// Go 1.15 and earlier target iOS with GOOS=darwin, tags=ios.
-		goos = "darwin"
-		tags = "ios " + tags
-	}
 	for _, a := range bi.archs {
 		clang, cflags, err := iosCompilerFor(target, a, bi.minsdk)
 		if err != nil {
@@ -519,7 +509,7 @@ func archiveIOS(tmpDir, target, frameworkRoot string, bi *buildInfo) error {
 		cflagsLine := strings.Join(cflags, " ")
 		cmd.Env = append(
 			os.Environ(),
-			"GOOS="+goos,
+			"GOOS=ios",
 			"GOARCH="+a,
 			"CGO_ENABLED=1",
 			"CC="+clang,
@@ -537,7 +527,7 @@ func archiveIOS(tmpDir, target, frameworkRoot string, bi *buildInfo) error {
 	if _, err := runCmd(lipo); err != nil {
 		return err
 	}
-	appDir, err := runCmd(exec.Command("go", "list", "-f", "{{.Dir}}", "gioui.org/app/"))
+	appDir, err := runCmd(exec.Command("go", "list", "-tags", tags, "-f", "{{.Dir}}", "gioui.org/app/"))
 	if err != nil {
 		return err
 	}
@@ -555,24 +545,6 @@ func archiveIOS(tmpDir, target, frameworkRoot string, bi *buildInfo) error {
 	return ioutil.WriteFile(moduleFile, []byte(module), 0644)
 }
 
-func supportsGOOS(wantGoos string) (bool, error) {
-	geese, err := runCmd(exec.Command("go", "tool", "dist", "list"))
-	if err != nil {
-		return false, err
-	}
-	for _, pair := range strings.Split(geese, "\n") {
-		s := strings.SplitN(pair, "/", 2)
-		if len(s) != 2 {
-			return false, fmt.Errorf("go tool dist list: invalid GOOS/GOARCH pair: %s", pair)
-		}
-		goos := s[0]
-		if goos == wantGoos {
-			return true, nil
-		}
-	}
-	return false, nil
-}
-
 func iosCompilerFor(target, arch string, minsdk int) (string, []string, error) {
 	var (
 		platformSDK string