status-im
/
mobile
mirror of
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/gomobile: init skips ndk download if usable toolchain exists. 

This feature is necessary when the cross compilers need to be rebuilt
because the goroot has been updated but the ndk version has not changed, or
when rebuilding is required but there is no network.

Currently the test for usable ndk compilers is simply checking
the presence of a file that's created after the ndk tool chain is installed
in the $GOPATH/pkg/gomobile/androind-<ndkversion> directory.

The -u option forces update of the ndk tool chain regardless.

Change-Id: I3d4f62266d436ddc52d158877f08481f92a6a690
Reviewed-on: https://go-review.googlesource.com/5140
Reviewed-by: David Crawshaw <crawshaw@golang.org>
This commit is contained in:
Hyang-Ah (Hana) Kim 2015-02-18 01:45:11 -05:00 committed by Hyang-Ah Hana Kim
parent 64689dc2a5
commit eada1f182c
1 changed files with 83 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
cmd/gomobile/init.go
View File

@ -53,9 +53,20 @@ var cmdInit = &command{
Init downloads and installs the Android C++ compiler toolchain.
The toolchain is installed in $GOPATH/pkg/gomobile.
If the Android C++ compiler toolchain already exists in the path,
it skips download and uses the existing toolchain.
The -u option forces download and installation of the new toolchain
even when the toolchain exists.
`,
}
var initU bool // -u
func init() {
cmdInit.flag.BoolVar(&initU, "u", false, "force toolchain download")
}
func runInit(cmd *command) error {
if err := checkGoVersion(); err != nil {
return err
@ -70,13 +81,21 @@ func runInit(cmd *command) error {
fmt.Fprintln(xout, "NDKCCPATH="+ndkccpath)
}
if err := removeAll(ndkccpath); err != nil && !os.IsExist(err) {
return err
sentinel := filepath.Join(ndkccpath, "ndk.sentinel")
needNDK := initU
if !needNDK {
if _, err := os.Stat(sentinel); err != nil {
needNDK = true
}
}
dst := filepath.Join(ndkccpath, "arm")
dstSysroot := filepath.Join(dst, "sysroot", "usr")
if err := mkdir(dstSysroot); err != nil {
return err
if needNDK {
if err := removeAll(ndkccpath); err != nil && !os.IsExist(err) {
return err
}
if err := mkdir(ndkccpath); err != nil {
return err
}
}
if buildN {
@ -99,30 +118,20 @@ func runInit(cmd *command) error {
return err
}
if err := fetchNDK(); err != nil {
return err
}
srcSysroot := filepath.Join(tmpdir, "android-ndk-r10d", "platforms", "android-15", "arch-arm", "usr")
if err := move(dstSysroot, srcSysroot, "include", "lib"); err != nil {
return err
}
ndkpath := filepath.Join(tmpdir, "android-ndk-r10d", "toolchains", "arm-linux-androideabi-4.8", "prebuilt", goos+"-"+ndkarch)
if err := move(dst, ndkpath, "bin", "lib", "libexec"); err != nil {
return err
}
linkpath := filepath.Join(dst, "arm-linux-androideabi", "bin")
if err := mkdir(linkpath); err != nil {
return err
}
for _, name := range []string{"ld", "as", "gcc", "g++"} {
if err := symlink(filepath.Join(dst, "bin", "arm-linux-androideabi-"+name), filepath.Join(linkpath, name)); err != nil {
if needNDK {
if err := fetchNDK(); err != nil {
return err
}
if !buildN {
if err := ioutil.WriteFile(sentinel, []byte("done"), 0644); err != nil {
return err
}
}
}
dst := filepath.Join(ndkccpath, "arm")
// TODO(crawshaw): make.bat on windows
ndkccbin := filepath.Join(dst, "bin")
envpath := os.Getenv("PATH")
@ -298,35 +307,63 @@ func checkGoVersion() error {
func fetchNDK() error {
if useStrippedNDK {
return fetchStrippedNDK()
if err := fetchStrippedNDK(); err != nil {
return err
}
} else {
ndkName := "android-" + ndkVersion + "-" + goos + "-" + ndkarch + "."
if goos == "windows" {
ndkName += "exe"
} else {
ndkName += "bin"
}
url := "https://dl.google.com/android/ndk/" + ndkName
if err := fetch(filepath.Join(tmpdir, ndkName), url); err != nil {
return err
}
inflate := exec.Command(filepath.Join(tmpdir, ndkName))
inflate.Dir = tmpdir
if buildX {
printcmd("%s", inflate.Args[0])
}
if !buildN {
out, err := inflate.CombinedOutput()
if err != nil {
if buildV {
os.Stderr.Write(out)
}
return err
}
}
}
ndkName := "android-" + ndkVersion + "-" + goos + "-" + ndkarch + "."
if goos == "windows" {
ndkName += "exe"
} else {
ndkName += "bin"
}
url := "https://dl.google.com/android/ndk/" + ndkName
if err := fetch(filepath.Join(tmpdir, ndkName), url); err != nil {
dst := filepath.Join(ndkccpath, "arm")
dstSysroot := filepath.Join(dst, "sysroot", "usr")
if err := mkdir(dstSysroot); err != nil {
return err
}
inflate := exec.Command(filepath.Join(tmpdir, ndkName))
inflate.Dir = tmpdir
if buildX {
printcmd("%s", inflate.Args[0])
srcSysroot := filepath.Join(tmpdir, "android-ndk-r10d", "platforms", "android-15", "arch-arm", "usr")
if err := move(dstSysroot, srcSysroot, "include", "lib"); err != nil {
return err
}
if buildN {
return nil
ndkpath := filepath.Join(tmpdir, "android-ndk-r10d", "toolchains", "arm-linux-androideabi-4.8", "prebuilt", goos+"-"+ndkarch)
if err := move(dst, ndkpath, "bin", "lib", "libexec"); err != nil {
return err
}
out, err := inflate.CombinedOutput()
if err != nil {
if buildV {
os.Stderr.Write(out)
linkpath := filepath.Join(dst, "arm-linux-androideabi", "bin")
if err := mkdir(linkpath); err != nil {
return err
}
for _, name := range []string{"ld", "as", "gcc", "g++"} {
if err := symlink(filepath.Join(dst, "bin", "arm-linux-androideabi-"+name), filepath.Join(linkpath, name)); err != nil {
return err
}
}
return err
return nil
}
func fetchStrippedNDK() error {