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

cmd/gomobile: use the stripped NDK for Windows client. 

Also moved the full ndk fetch into a separate function.

Change-Id: Ib5c4687e98a5d92ff3aa3ca99ec0ebee85d31f86
Reviewed-on: https://go-review.googlesource.com/6662
Reviewed-by: David Crawshaw <crawshaw@golang.org>
This commit is contained in:
Hyang-Ah (Hana) Kim 2015-03-03 15:13:51 -05:00 committed by Hyang-Ah Hana Kim
parent a49d80e2cf
commit 79fcbd2571
1 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
cmd/gomobile/init.go
View File

@ -27,7 +27,7 @@ import (
// hosted specifically for the gomobile tool.
//
// There is a significant size different (400MB compared to 30MB).
var useStrippedNDK = goos == "linux" || goos == "darwin"
var useStrippedNDK = true
const ndkVersion = "ndk-r10d"
@ -134,7 +134,6 @@ func runInit(cmd *command) error {
dst := filepath.Join(ndkccpath, "arm")
// TODO(crawshaw): make.bat on windows
ndkccbin := filepath.Join(dst, "bin")
envpath := os.Getenv("PATH")
if buildN {
@ -370,49 +369,9 @@ func fetchNDK() error {
return err
}
} else {
ndkName := "android-" + ndkVersion + "-" + goos + "-" + ndkarch + "."
if goos == "windows" {
ndkName += "exe"
} else {
ndkName += "bin"
}
archive := filepath.Join(tmpdir, ndkName)
url := "https://dl.google.com/android/ndk/" + ndkName
if err := fetch(archive, url); err != nil {
if err := fetchFullNDK(); err != nil {
return err
}
// The self-extracting ndk dist file for Windows
// terminates with an error (error code 2 - corrupted or incomplete file)
// but there are no details on what caused this.
//
// Strangely, if the file is launched from file
// browser or unzipped with 7z.exe no error is reported.
// For now, we require 7z.exe on windows.
//
// Once we start using the stripped NDK, this code path
// will not matter.
//
// TODO(hyangah): don't depend on 7z.exe for windows.
var inflate *exec.Cmd
if goos != "windows" {
inflate = exec.Command(archive)
} else {
inflate = exec.Command("7z.exe", "x", archive)
}
inflate.Dir = tmpdir
if buildX {
printcmd("%s", archive)
}
if !buildN {
out, err := inflate.CombinedOutput()
if err != nil {
if buildV {
os.Stderr.Write(out)
}
return err
}
}
}
dst := filepath.Join(ndkccpath, "arm")
@ -506,6 +465,53 @@ func fetchStrippedNDK() error {
return nil
}
func fetchFullNDK() error {
ndkName := "android-" + ndkVersion + "-" + goos + "-" + ndkarch + "."
if goos == "windows" {
ndkName += "exe"
} else {
ndkName += "bin"
}
archive := filepath.Join(tmpdir, ndkName)
url := "https://dl.google.com/android/ndk/" + ndkName
if err := fetch(archive, url); err != nil {
return err
}
// The self-extracting ndk dist file for Windows
// terminates with an error (error code 2 - corrupted or incomplete file)
// but there are no details on what caused this.
//
// Strangely, if the file is launched from file
// browser or unzipped with 7z.exe no error is reported.
// For now, we require 7z.exe on windows.
//
// Once we start using the stripped NDK, this code path
// will not matter.
//
// TODO(hyangah): don't depend on 7z.exe for windows.
var inflate *exec.Cmd
if goos != "windows" {
inflate = exec.Command(archive)
} else {
inflate = exec.Command("7z.exe", "x", archive)
}
inflate.Dir = tmpdir
if buildX {
printcmd("%s", archive)
}
if !buildN {
out, err := inflate.CombinedOutput()
if err != nil {
if buildV {
os.Stderr.Write(out)
}
return err
}
}
return nil
}
func fetch(dst, url string) error {
if buildV {
fmt.Fprintf(os.Stderr, "fetching %s\n", url)