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

cmd/gomobile: rename pkgImportsAudio to pkgImportsAL 

We are determining whether to add libopenal.so dependending on the
al package imports. The names must suggest we are looking for the
al package rather than the audio.

Change-Id: Ib6896302238ff1ebe135f004b134911a0c340821
Reviewed-on: https://go-review.googlesource.com/11680
Reviewed-by: David Crawshaw <crawshaw@golang.org>
This commit is contained in:
Burcu Dogan 2015-06-29 08:11:05 -07:00
parent beece5b2b6
commit b9ad843048
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/gomobile/build.go
View File

@ -216,8 +216,8 @@ func runBuild(cmd *command) (err error) {
}
}
importsAudio := pkgImportsAudio(pkg)
if importsAudio {
importsAL := pkgImportsAL(pkg)
if importsAL {
alDir := filepath.Join(ndkccpath, "openal/lib")
filepath.Walk(alDir, func(path string, info os.FileInfo, err error) error {
if err != nil {
@ -424,28 +424,28 @@ func goAndroidBuild(src, libPath string) error {
return nil
}
var importsAudioPkgs = make(map[string]struct{})
var importsALPkg = make(map[string]struct{})
// pkgImportsAudio returns true if the given package or one of its
// dependencies imports the mobile/audio package.
func pkgImportsAudio(pkg *build.Package) bool {
// pkgImportsAL returns true if the given package or one of its
// dependencies imports the x/mobile/exp/audio/al package.
func pkgImportsAL(pkg *build.Package) bool {
for _, path := range pkg.Imports {
if path == "C" {
continue
}
if _, ok := importsAudioPkgs[path]; ok {
if _, ok := importsALPkg[path]; ok {
continue
}
importsAudioPkgs[path] = struct{}{}
importsALPkg[path] = struct{}{}
if strings.HasPrefix(path, "golang.org/x/mobile/exp/audio/al") {
return true
}
dPkg, err := ctx.Import(path, "", build.ImportComment)
if err != nil {
fmt.Fprintf(os.Stderr, "error while looking up for the audio package: %v", err)
fmt.Fprintf(os.Stderr, "error reading OpenAL library: %v", err)
os.Exit(2)
}
if pkgImportsAudio(dPkg) {
if pkgImportsAL(dPkg) {
return true
}
}