diff --git a/bluetooth/cgo_linux_386.go b/bluetooth/cgo_linux_386.go index 307270dac..59e1e6fcd 100755 --- 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 index 84e788f51..ed170adaf 100755 --- 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 index 73d3894a9..58b51810c 100755 --- 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 index 26f06a8dd..2530d178f 100755 --- 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 index 331d2838a..cff4f9638 100755 --- 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 index 2eeae6a3a..35e8166c7 100755 --- 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 index 29464582e..e07ab74f7 100755 --- 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 index 21e83bb82..ce7f74f52 100755 --- 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 index 9c41cb90d..5e5b700f0 100755 --- 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 index f9160b60d..8c574bcf7 100755 --- 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 index 3db1c39f3..70a877700 100755 --- 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 index eb1d1c302..e110e3587 100755 --- 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 index d60f6edac..ef4c02cd8 100755 --- 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 index 9727453fb..12a519ce9 100755 --- 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 index 1c2091e2c..044cc1873 100755 --- 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 index e3055dc71..cd638b251 100755 --- 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 index d6318baf5..37224f0cb 100755 --- 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 index 14aea3976..f6f621d15 100755 --- 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 index 92825301c..0b64c1eba 100755 --- 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 index aea5f1fe8..ae1d489eb 100755 --- 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 index 8ad9be70a..3ac92628e 100755 --- 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 index 57819c0fe..522223c13 100755 --- 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 index 5e403622a..bc6a465e4 100755 --- 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 index bdc2d3491..9703cfe9a 100755 --- 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 index 6ceddd7db..7dbf1d193 100755 --- 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 index 93bfaee78..483c4314a 100755 --- 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 index 2808d43ad..f4b6d93ca 100755 --- 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 index 4b7d85c96..9a8127f9f 100755 --- 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 index 90c523dc2..c2399691e 100755 --- 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 index b50dd1cae..793a8b9b8 100755 --- 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 index 0e5b1fbf6..7ef69cf37 100755 --- 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 index a5d9e2dca..64d3c30c3 100755 --- 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 index 9d25b5dbb..c65c8585a 100755 --- 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 index 5695e35f2..d713fb266 100755 --- 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 index bf465bc69..5b5a39c9a 100755 --- 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 index b672cc003..07219265c 100755 --- 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 index f7fa7efdd..2b62e7fd3 100755 --- 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 index 87687fc37..7da666c7d 100755 --- 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 index 7cbe43b9f..46c023b6e 100755 --- 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 index 026f65648..be2b15ba0 100755 --- 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 index 2f69e7509..bd4d903a5 100755 --- 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 index b10dc4970..477722e40 100755 --- 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 index 8dc0cce93..551403edb 100755 --- 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 index 678d015d0..bb2250087 100755 --- 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 index e626e3aec..5eba19131 100755 --- 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 index 6f350a2c5..ec58d1497 100755 --- 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 index 14aa8dd85..5b6c392d2 100755 --- 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 index 6edddabd9..71956d013 100755 --- 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 index 198187ec9..7097d32fb 100755 --- 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 index f726eca97..53ec9996c 100755 --- 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 index d44915c37..a6801d268 100755 --- 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 index 6999b24c9..00db9fc3b 100755 --- 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 index ca4f09e3a..c7b9c0778 100755 --- 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 index c0e4194bf..b42644f0e 100755 --- 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 index ff7f7c87d..fc15dbee9 100755 --- 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 index 58f6f9b0a..408051140 100755 --- 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 index 3cb6beddc..b512aff2e 100755 --- 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 index 8ea964fa9..252f28e4d 100755 --- 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 index 052057501..07fce82d8 100755 --- 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 index 92dd5fc07..5262a7be1 100755 --- 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 index bd30f442b..0b58945f6 100755 --- a/xmlpatterns/cgo_linux_arm.go +++ b/xmlpatterns/cgo_linux_arm.go @@ -1,3 +1,5 @@ +// +build !android + package xmlpatterns /*