go.mobile: use golang.org/x/... import paths
LGTM=bradfitz, rsc R=rsc, bradfitz CC=golang-codereviews https://golang.org/cl/162710043
This commit is contained in:
parent
385a1a25f7
commit
9470e0ba58
@ -36,7 +36,7 @@ import (
|
||||
"runtime"
|
||||
"unsafe"
|
||||
|
||||
"code.google.com/p/go.mobile/geom"
|
||||
"golang.org/x/mobile/geom"
|
||||
)
|
||||
|
||||
//export onCreate
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
package app
|
||||
|
||||
import "code.google.com/p/go.mobile/event"
|
||||
import "golang.org/x/mobile/event"
|
||||
|
||||
// Run starts the app.
|
||||
//
|
||||
|
@ -33,9 +33,9 @@ import (
|
||||
"runtime"
|
||||
"sync"
|
||||
|
||||
"code.google.com/p/go.mobile/event"
|
||||
"code.google.com/p/go.mobile/geom"
|
||||
"code.google.com/p/go.mobile/gl"
|
||||
"golang.org/x/mobile/event"
|
||||
"golang.org/x/mobile/geom"
|
||||
"golang.org/x/mobile/gl"
|
||||
)
|
||||
|
||||
var initThreadID uint64
|
||||
|
@ -17,8 +17,8 @@ import (
|
||||
"time"
|
||||
|
||||
"code.google.com/p/freetype-go/freetype"
|
||||
"code.google.com/p/go.mobile/geom"
|
||||
"code.google.com/p/go.mobile/gl/glutil"
|
||||
"golang.org/x/mobile/geom"
|
||||
"golang.org/x/mobile/gl/glutil"
|
||||
)
|
||||
|
||||
var lastDraw = time.Now()
|
||||
|
@ -57,7 +57,7 @@ function exits, the app exits.
|
||||
import (
|
||||
"log"
|
||||
|
||||
"code.google.com/p/go.mobile/app"
|
||||
"golang.org/x/mobile/app"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
@ -81,9 +81,9 @@ import "C"
|
||||
import (
|
||||
"log"
|
||||
|
||||
"code.google.com/p/go.mobile/event"
|
||||
"code.google.com/p/go.mobile/geom"
|
||||
"code.google.com/p/go.mobile/gl"
|
||||
"golang.org/x/mobile/event"
|
||||
"golang.org/x/mobile/geom"
|
||||
"golang.org/x/mobile/gl"
|
||||
)
|
||||
|
||||
func windowDrawLoop(cb Callbacks, w *C.ANativeWindow, queue *C.AInputQueue) {
|
||||
|
@ -25,8 +25,8 @@ import (
|
||||
"runtime"
|
||||
"sync"
|
||||
|
||||
"code.google.com/p/go.mobile/event"
|
||||
"code.google.com/p/go.mobile/geom"
|
||||
"golang.org/x/mobile/event"
|
||||
"golang.org/x/mobile/geom"
|
||||
)
|
||||
|
||||
var cb Callbacks
|
||||
|
@ -16,7 +16,7 @@ import (
|
||||
"go/token"
|
||||
"io"
|
||||
|
||||
"code.google.com/p/go.tools/go/types"
|
||||
"golang.org/x/tools/go/types"
|
||||
)
|
||||
|
||||
// GenJava generates a Java API from a Go package.
|
||||
|
@ -13,8 +13,8 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
_ "code.google.com/p/go.tools/go/gcimporter"
|
||||
"code.google.com/p/go.tools/go/types"
|
||||
_ "golang.org/x/tools/go/gcimporter"
|
||||
"golang.org/x/tools/go/types"
|
||||
)
|
||||
|
||||
var updateFlag = flag.Bool("update", false, "Update the golden files.")
|
||||
|
@ -9,7 +9,7 @@ import (
|
||||
"go/token"
|
||||
"log"
|
||||
|
||||
"code.google.com/p/go.tools/go/types"
|
||||
"golang.org/x/tools/go/types"
|
||||
)
|
||||
|
||||
type goGen struct {
|
||||
@ -29,7 +29,7 @@ const goPreamble = `// Package go_%s is an autogenerated binder stub for package
|
||||
package go_%s
|
||||
|
||||
import (
|
||||
"code.google.com/p/go.mobile/bind/seq"
|
||||
"golang.org/x/mobile/bind/seq"
|
||||
%q
|
||||
)
|
||||
|
||||
|
@ -13,7 +13,7 @@ import (
|
||||
"unicode"
|
||||
"unicode/utf8"
|
||||
|
||||
"code.google.com/p/go.tools/go/types"
|
||||
"golang.org/x/tools/go/types"
|
||||
)
|
||||
|
||||
// TODO(crawshaw): disallow basic android java type names in exported symbols.
|
||||
|
@ -7,9 +7,9 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"code.google.com/p/go.mobile/app"
|
||||
"golang.org/x/mobile/app"
|
||||
|
||||
_ "code.google.com/p/go.mobile/bind/java/testpkg/go_testpkg"
|
||||
_ "golang.org/x/mobile/bind/java/testpkg/go_testpkg"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
@ -15,8 +15,8 @@ import (
|
||||
"sync"
|
||||
"unsafe"
|
||||
|
||||
"code.google.com/p/go.mobile/app"
|
||||
"code.google.com/p/go.mobile/bind/seq"
|
||||
"golang.org/x/mobile/app"
|
||||
"golang.org/x/mobile/bind/seq"
|
||||
)
|
||||
|
||||
const maxSliceLen = 1<<31 - 1
|
||||
|
@ -5,8 +5,8 @@
|
||||
package go_testpkg
|
||||
|
||||
import (
|
||||
"code.google.com/p/go.mobile/bind/java/testpkg"
|
||||
"code.google.com/p/go.mobile/bind/seq"
|
||||
"golang.org/x/mobile/bind/java/testpkg"
|
||||
"golang.org/x/mobile/bind/seq"
|
||||
)
|
||||
|
||||
func proxy_Add(out, in *seq.Buffer) {
|
||||
|
@ -3,7 +3,7 @@ package bind
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"code.google.com/p/go.tools/go/types"
|
||||
"golang.org/x/tools/go/types"
|
||||
)
|
||||
|
||||
// seqType returns a string that can be used for reading and writing a
|
||||
|
@ -14,8 +14,8 @@ import (
|
||||
"go/scanner"
|
||||
"go/token"
|
||||
|
||||
"code.google.com/p/go.mobile/bind"
|
||||
"code.google.com/p/go.tools/go/loader"
|
||||
"golang.org/x/mobile/bind"
|
||||
"golang.org/x/tools/go/loader"
|
||||
)
|
||||
|
||||
func genPkg(pkg *build.Package) {
|
||||
|
@ -15,7 +15,7 @@ https://developer.apple.com/library/ios/documentation/EventHandling/Conceptual/E
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"code.google.com/p/go.mobile/geom"
|
||||
"golang.org/x/mobile/geom"
|
||||
)
|
||||
|
||||
// Touch is a user touch event.
|
||||
|
@ -9,13 +9,13 @@ import (
|
||||
"encoding/binary"
|
||||
"log"
|
||||
|
||||
"code.google.com/p/go.mobile/app"
|
||||
"code.google.com/p/go.mobile/app/debug"
|
||||
"code.google.com/p/go.mobile/event"
|
||||
"code.google.com/p/go.mobile/f32"
|
||||
"code.google.com/p/go.mobile/geom"
|
||||
"code.google.com/p/go.mobile/gl"
|
||||
"code.google.com/p/go.mobile/gl/glutil"
|
||||
"golang.org/x/mobile/app"
|
||||
"golang.org/x/mobile/app/debug"
|
||||
"golang.org/x/mobile/event"
|
||||
"golang.org/x/mobile/f32"
|
||||
"golang.org/x/mobile/geom"
|
||||
"golang.org/x/mobile/gl"
|
||||
"golang.org/x/mobile/gl/glutil"
|
||||
)
|
||||
|
||||
var (
|
||||
|
@ -4,8 +4,8 @@
|
||||
package go_hi
|
||||
|
||||
import (
|
||||
"code.google.com/p/go.mobile/bind/seq"
|
||||
"code.google.com/p/go.mobile/example/libhello/hi"
|
||||
"golang.org/x/mobile/bind/seq"
|
||||
"golang.org/x/mobile/example/libhello/hi"
|
||||
)
|
||||
|
||||
func proxy_Hello(out, in *seq.Buffer) {
|
||||
|
@ -9,10 +9,10 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"code.google.com/p/go.mobile/app"
|
||||
"golang.org/x/mobile/app"
|
||||
|
||||
_ "code.google.com/p/go.mobile/bind/java"
|
||||
_ "code.google.com/p/go.mobile/example/libhello/hi/go_hi"
|
||||
_ "golang.org/x/mobile/bind/java"
|
||||
_ "golang.org/x/mobile/example/libhello/hi/go_hi"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
@ -23,7 +23,7 @@ The result will be no make.bash, and no need to write C.
|
||||
*/
|
||||
package main
|
||||
|
||||
import "code.google.com/p/go.mobile/app"
|
||||
import "golang.org/x/mobile/app"
|
||||
|
||||
func main() {
|
||||
app.Run()
|
||||
|
@ -9,9 +9,9 @@ import (
|
||||
"image"
|
||||
"sync"
|
||||
|
||||
"code.google.com/p/go.mobile/f32"
|
||||
"code.google.com/p/go.mobile/geom"
|
||||
"code.google.com/p/go.mobile/gl"
|
||||
"golang.org/x/mobile/f32"
|
||||
"golang.org/x/mobile/geom"
|
||||
"golang.org/x/mobile/gl"
|
||||
)
|
||||
|
||||
var glimage struct {
|
||||
|
@ -17,8 +17,8 @@ import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"code.google.com/p/go.mobile/geom"
|
||||
"code.google.com/p/go.mobile/gl"
|
||||
"golang.org/x/mobile/geom"
|
||||
"golang.org/x/mobile/gl"
|
||||
)
|
||||
|
||||
func TestImage(t *testing.T) {
|
||||
|
@ -8,7 +8,7 @@ package glutil
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"code.google.com/p/go.mobile/gl"
|
||||
"golang.org/x/mobile/gl"
|
||||
)
|
||||
|
||||
// CreateProgram creates, compiles, and links a gl.Program.
|
||||
|
@ -7,7 +7,7 @@ package gl
|
||||
// This file contains GL Types and their methods that are independent of the
|
||||
// "gldebug" build tag.
|
||||
|
||||
import "code.google.com/p/go.mobile/f32"
|
||||
import "golang.org/x/mobile/f32"
|
||||
|
||||
// WriteAffine writes the contents of an Affine to a 3x3 matrix GL uniform.
|
||||
func (u Uniform) WriteAffine(a *f32.Affine) {
|
||||
|
@ -8,7 +8,7 @@ import (
|
||||
"image"
|
||||
"image/draw"
|
||||
|
||||
"code.google.com/p/go.mobile/f32"
|
||||
"golang.org/x/mobile/f32"
|
||||
)
|
||||
|
||||
// affine draws each pixel of dst using bilinear interpolation of the
|
||||
|
@ -14,8 +14,8 @@ import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"code.google.com/p/go.mobile/f32"
|
||||
"code.google.com/p/go.mobile/geom"
|
||||
"golang.org/x/mobile/f32"
|
||||
"golang.org/x/mobile/geom"
|
||||
)
|
||||
|
||||
func TestAffine(t *testing.T) {
|
||||
|
@ -14,10 +14,10 @@ import (
|
||||
"image"
|
||||
"image/draw"
|
||||
|
||||
"code.google.com/p/go.mobile/f32"
|
||||
"code.google.com/p/go.mobile/geom"
|
||||
"code.google.com/p/go.mobile/sprite"
|
||||
"code.google.com/p/go.mobile/sprite/clock"
|
||||
"golang.org/x/mobile/f32"
|
||||
"golang.org/x/mobile/geom"
|
||||
"golang.org/x/mobile/sprite"
|
||||
"golang.org/x/mobile/sprite/clock"
|
||||
)
|
||||
|
||||
// Engine builds a sprite Engine that renders onto dst.
|
||||
|
@ -27,8 +27,8 @@ package sprite
|
||||
import (
|
||||
"image"
|
||||
|
||||
"code.google.com/p/go.mobile/f32"
|
||||
"code.google.com/p/go.mobile/sprite/clock"
|
||||
"golang.org/x/mobile/f32"
|
||||
"golang.org/x/mobile/sprite/clock"
|
||||
)
|
||||
|
||||
type Arranger interface {
|
||||
|
Loading…
x
Reference in New Issue
Block a user