android fix

mixedCase · Jun 14, 2016 · 70f5b2b · 70f5b2b
1 parent a6a0643
commit 70f5b2b
Show file tree

Hide file tree

Showing 61 changed files with 120 additions and 1 deletion.
diff --git a/bluetooth/cgo_linux_386.go b/bluetooth/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package bluetooth
 
 /*

diff --git a/bluetooth/cgo_linux_arm.go b/bluetooth/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package bluetooth
 
 /*

diff --git a/core/cgo_linux_386.go b/core/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package core
 
 /*

diff --git a/core/cgo_linux_arm.go b/core/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package core
 
 /*

diff --git a/dbus/cgo_linux_386.go b/dbus/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package dbus
 
 /*

diff --git a/dbus/cgo_linux_arm.go b/dbus/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package dbus
 
 /*

diff --git a/designer/cgo_linux_386.go b/designer/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package designer
 
 /*

diff --git a/designer/cgo_linux_arm.go b/designer/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package designer
 
 /*

diff --git a/gui/cgo_linux_386.go b/gui/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package gui
 
 /*

diff --git a/gui/cgo_linux_arm.go b/gui/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package gui
 
 /*

diff --git a/help/cgo_linux_386.go b/help/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package help
 
 /*

diff --git a/help/cgo_linux_arm.go b/help/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package help
 
 /*

diff --git a/internal/binding/templater/cgo.go b/internal/binding/templater/cgo.go
@@ -450,7 +450,7 @@ func cgoIos(module string) string {
 
 func cgoSailfish(module string) {
 	var (
-		tmp  string
+		tmp  = "// +build !android\n\n"
 		libs = cleanLibs(module)
 	)
 

diff --git a/internal/deploy/deploy.go b/internal/deploy/deploy.go
@@ -295,6 +295,7 @@ func build() {
 	case "android":
 		{
 			ldFlags += "\"-s\" \"-w\""
+			tagFlags += "\"android\""
 			outputFile = filepath.Join(depPath, "libgo_base.so")
 
 			switch runtime.GOOS {

diff --git a/internal/setup/install.go b/internal/setup/install.go
@@ -30,6 +30,8 @@ func main() {
 		case
 			"android":
 			{
+				tagFlags = "-tags=\"android\""
+
 				switch runtime.GOOS {
 				case "darwin", "linux":
 					{

diff --git a/location/cgo_linux_386.go b/location/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package location
 
 /*

diff --git a/location/cgo_linux_arm.go b/location/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package location
 
 /*

diff --git a/macextras/cgo_linux_386.go b/macextras/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package macextras
 
 /*

diff --git a/macextras/cgo_linux_arm.go b/macextras/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package macextras
 
 /*

diff --git a/multimedia/cgo_linux_386.go b/multimedia/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package multimedia
 
 /*

diff --git a/multimedia/cgo_linux_arm.go b/multimedia/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package multimedia
 
 /*

diff --git a/network/cgo_linux_386.go b/network/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package network
 
 /*

diff --git a/network/cgo_linux_arm.go b/network/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package network
 
 /*

diff --git a/nfc/cgo_linux_386.go b/nfc/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package nfc
 
 /*

diff --git a/nfc/cgo_linux_arm.go b/nfc/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package nfc
 
 /*

diff --git a/positioning/cgo_linux_386.go b/positioning/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package positioning
 
 /*

diff --git a/positioning/cgo_linux_arm.go b/positioning/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package positioning
 
 /*

diff --git a/printsupport/cgo_linux_386.go b/printsupport/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package printsupport
 
 /*

diff --git a/printsupport/cgo_linux_arm.go b/printsupport/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package printsupport
 
 /*

diff --git a/qml/cgo_linux_386.go b/qml/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package qml
 
 /*

diff --git a/qml/cgo_linux_arm.go b/qml/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package qml
 
 /*

diff --git a/quick/cgo_linux_386.go b/quick/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package quick
 
 /*

diff --git a/quick/cgo_linux_arm.go b/quick/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package quick
 
 /*

diff --git a/script/cgo_linux_386.go b/script/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package script
 
 /*

diff --git a/script/cgo_linux_arm.go b/script/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package script
 
 /*

diff --git a/scripttools/cgo_linux_386.go b/scripttools/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package scripttools
 
 /*

diff --git a/scripttools/cgo_linux_arm.go b/scripttools/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package scripttools
 
 /*

diff --git a/sensors/cgo_linux_386.go b/sensors/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package sensors
 
 /*

diff --git a/sensors/cgo_linux_arm.go b/sensors/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package sensors
 
 /*

diff --git a/serialport/cgo_linux_386.go b/serialport/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package serialport
 
 /*

diff --git a/serialport/cgo_linux_arm.go b/serialport/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package serialport
 
 /*

diff --git a/sql/cgo_linux_386.go b/sql/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package sql
 
 /*

diff --git a/sql/cgo_linux_arm.go b/sql/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package sql
 
 /*

diff --git a/svg/cgo_linux_386.go b/svg/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package svg
 
 /*

diff --git a/svg/cgo_linux_arm.go b/svg/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package svg
 
 /*

diff --git a/testlib/cgo_linux_386.go b/testlib/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package testlib
 
 /*

diff --git a/testlib/cgo_linux_arm.go b/testlib/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package testlib
 
 /*

diff --git a/uitools/cgo_linux_386.go b/uitools/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package uitools
 
 /*

diff --git a/uitools/cgo_linux_arm.go b/uitools/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package uitools
 
 /*

diff --git a/webchannel/cgo_linux_386.go b/webchannel/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package webchannel
 
 /*

diff --git a/webchannel/cgo_linux_arm.go b/webchannel/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package webchannel
 
 /*

diff --git a/webengine/cgo_linux_386.go b/webengine/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package webengine
 
 /*

diff --git a/webengine/cgo_linux_arm.go b/webengine/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package webengine
 
 /*

diff --git a/websockets/cgo_linux_386.go b/websockets/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package websockets
 
 /*

diff --git a/websockets/cgo_linux_arm.go b/websockets/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package websockets
 
 /*

diff --git a/widgets/cgo_linux_386.go b/widgets/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package widgets
 
 /*

diff --git a/widgets/cgo_linux_arm.go b/widgets/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package widgets
 
 /*

diff --git a/xml/cgo_linux_386.go b/xml/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package xml
 
 /*

diff --git a/xml/cgo_linux_arm.go b/xml/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package xml
 
 /*

diff --git a/xmlpatterns/cgo_linux_386.go b/xmlpatterns/cgo_linux_386.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package xmlpatterns
 
 /*

diff --git a/xmlpatterns/cgo_linux_arm.go b/xmlpatterns/cgo_linux_arm.go
@@ -1,3 +1,5 @@
+// +build !android
+
 package xmlpatterns
 
 /*