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

Conversation

abe-winter
Copy link
Member

@abe-winter abe-winter commented May 22, 2024

What changed

  • minor remaining flag changes from droid-apk branch

Why

  • get make droid-rdk.aar command functional
  • android builds can now target main branch instead of the fork

Builds tested

with sha 19375ba

  • make droid-rdk.aar
  • make full-static (in shell with no tflite)
  • make server
    (retested these to make sure flagging changes didn't break anything)

abe-winter and others added 30 commits January 24, 2024 18:42
* Add support for tflitecpu on android

* Update etc/android/build-tflite.sh

Co-authored-by: abe-winter <abe-winter@users.noreply.github.com>

* pr changes

---------

Co-authored-by: abe-winter <abe-winter@users.noreply.github.com>
abe-winter and others added 15 commits March 4, 2024 19:42
* working x264 build in etc

* factor android make commands to own file, add temp gostream build command

* actual working gostream command

* video-only makeStreamConfig for no_cgo mode

* add patched makeStreamServer to web_notc.go (needs cleanup). move functions from web_c.go -> web.go unchanged: StreamServer, closeStreamServer, initStreamServer, refreshVideoSources, startVideoStream, startStream, propertiesFromStream

* build works with arm64 only -- need approach to link x86 as well

* removed unneeded flags

* x264 architecture: add x86, add armv8-a for linux (remove latter until time to test though)

* build separately, merge after (so x264 can link per-platform)

* single and multiarch AARs

* clean old droidtmp to prevent CRC error from zip

* rm temp gostream target

* clearer arch lookups in make

* include so.NNN in archives

* properly handle symlinks in zips, make prefix paths secondary so they don't fail to unlink

* soname patch

* undo x264 changes before reapply

* much simpler android flags for streaming (graphviz is only major copied code)

* fix tagging so graphviz_{c,nocgo} are exclusive

* gomobile in tools for lint

* lose println for lint (PlatformHomeDir is going away for merge anyway)

* lint

* use NDK_ROOT from environment where present

* lint
@viambot viambot added the safe to test This pull request is marked safe to test from a trusted zone label May 22, 2024
@abe-winter abe-winter requested a review from seanavery May 22, 2024 14:45
@abe-winter abe-winter marked this pull request as ready for review May 22, 2024 14:45
@viambot viambot added safe to test This pull request is marked safe to test from a trusted zone and removed safe to test This pull request is marked safe to test from a trusted zone labels May 22, 2024
@abe-winter abe-winter merged commit ef5512b into viamrobotics:main May 22, 2024
17 checks passed
@abe-winter abe-winter deleted the droid-final-merge branch May 22, 2024 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
safe to test This pull request is marked safe to test from a trusted zone
Projects
None yet
4 participants