Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RSDK-6865 android flag changes #3986

Merged
merged 46 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
0986357
expose more of the camera API in no_cgo
abe-winter Jan 24, 2024
b151f3f
lint
abe-winter Jan 24, 2024
9ede5ff
working with go 1.19 and newish gomobile command
abe-winter Jan 25, 2024
ae48853
makefile compatible with gomobile install
abe-winter Jan 25, 2024
51815ab
library build
abe-winter Jan 25, 2024
81f08d0
rename aar
abe-winter Jan 26, 2024
a57e38f
rm apk target, using aar now
abe-winter Feb 1, 2024
75935b7
add -config to droid main (and -debug for now)
abe-winter Feb 1, 2024
b450ad2
custom home + temp dirs on droid bc of missing write permissions
abe-winter Feb 1, 2024
51daefa
target sdk 28 for executable data dir, rm debug logging
abe-winter Feb 3, 2024
cf4ab50
add droid module hack to copy from /sdcard/Download for non-root case
abe-winter Feb 5, 2024
43e4ffd
add services/mlmodel to no_cgo -- only tflite_cpu needs to be no_cgo
abe-winter Feb 7, 2024
8a9ef0b
enable services/vision under no_cgo (but flag off subpackages)
abe-winter Feb 7, 2024
b55a399
add mlvision to no_cgo
abe-winter Feb 8, 2024
b49016c
enable transform camera in no_cgo
abe-winter Feb 8, 2024
906e5c8
restrict architectures for smaller aar
abe-winter Feb 9, 2024
e889367
Merge branch 'main' into droid-apk
abe-winter Feb 9, 2024
6bf6ea2
Merge branch 'main' into droid-apk
abe-winter Feb 9, 2024
88377d6
remove unused main_android (we use droid/droid.go now)
abe-winter Feb 9, 2024
2eaf3fb
use android cache instead of files (latter has size limit)
abe-winter Feb 9, 2024
fb82cb6
build for amd64 not 386, don't fatal() when module hack fails
abe-winter Feb 9, 2024
b645c72
Merge branch 'main' into droid-apk
abe-winter Feb 12, 2024
9e2fc0f
todo dir fix
abe-winter Feb 14, 2024
d22cd80
restore gripper in no_cgo
abe-winter Feb 15, 2024
caf1960
Merge remote-tracking branch 'origin/main' into droid-apk
abe-winter Feb 20, 2024
d591d02
Merge remote-tracking branch 'origin/main' into droid-apk
abe-winter Feb 27, 2024
ab4e5cf
move microphone import to no_cgo
abe-winter Feb 27, 2024
94c4fae
DroidStopHook
abe-winter Mar 2, 2024
ce472aa
Add support for tflitecpu on android (#2)
edaniels Mar 4, 2024
7b3e4de
+x script, fix hint
abe-winter Mar 4, 2024
1d80876
Merge branch 'main' into droid-apk
abe-winter Mar 5, 2024
39a2460
Clear CGO_LDFLAGS for aar build (#3)
abe-winter Mar 6, 2024
9594cc0
Merge branch 'main' into droid-apk
abe-winter Mar 7, 2024
9c5272c
Merge branch 'main' into droid-apk
abe-winter Mar 19, 2024
c71678c
port build changes from droid-ci without x264 changes
abe-winter Apr 4, 2024
1846c71
comment x264 deps and rm commented code
abe-winter Apr 4, 2024
925cde4
Allow env vars to be passed in (#5)
edaniels Apr 8, 2024
5e56c1e
x264 support in .aar target (#4)
abe-winter Apr 8, 2024
eeef17b
Merge branch 'main' into droid-apk
abe-winter Apr 8, 2024
99d502d
patchelf
abe-winter Apr 14, 2024
ba73f4f
Merge branch 'main' into droid-apk
abe-winter May 2, 2024
f7f3fbc
lint
abe-winter May 2, 2024
2c69eba
Merge branch 'main' into droid-final-merge
abe-winter May 22, 2024
bf048e2
remove droidmodulehack
abe-winter May 22, 2024
cd4dc03
shrink diff for go.mod / build constraints
abe-winter May 22, 2024
19375ba
re-guard tflite for no_cgo on non-android
abe-winter May 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions components/register/all.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
_ "go.viam.com/rdk/components/encoder/register"
_ "go.viam.com/rdk/components/gantry/register"
_ "go.viam.com/rdk/components/generic/register"
_ "go.viam.com/rdk/components/gripper/register"
_ "go.viam.com/rdk/components/input/register"
_ "go.viam.com/rdk/components/motor/register"
_ "go.viam.com/rdk/components/movementsensor/register"
Expand Down
1 change: 0 additions & 1 deletion components/register/all_cgo.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ import (
_ "go.viam.com/rdk/components/arm/register"
_ "go.viam.com/rdk/components/audioinput/register"
_ "go.viam.com/rdk/components/base/register"
_ "go.viam.com/rdk/components/gripper/register"
)
2 changes: 1 addition & 1 deletion ml/inference/tflite.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build !arm && !windows && !no_tflite && !no_cgo
//go:build !arm && !windows && !no_tflite && (!no_cgo || android)

package inference

Expand Down
Loading