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.

Sign up for GitHub

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

Improve scripts #90

Merged
merged 2 commits into from
Apr 8, 2023
Merged

Improve scripts #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c0032e
check found ndk toolchain in build_roc.sh
ortex Apr 8, 2023
0d9f90f
fix android_device.sh instruction usage in readme
ortex Apr 8, 2023
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,15 +252,15 @@ It is used in docker and on CI, but you can also use it directly. Supported comm
* `create` an AVD:

```
./scripts/android_device.sh create --api=<API> --image=<IMAGE> --arch=<ARCH> --name=<AVD-NAME>
./scripts/android_device.sh --api <API> --image <IMAGE> --arch <ARCH> --name <AVD-NAME> create
```

The string ``"system-images;android-<API>;<IMAGE>;<ARCH>"`` defines the emulator system image to be installed (it must be present in the list offered by ``sdkmanager --list``)

* `start` device and wait until boot is completed:

```
./scripts/android_device.sh start --name=<AVD-NAME>
./scripts/android_device.sh --name <AVD-NAME> start
```

#### Documentation build
Expand Down
11 changes: 9 additions & 2 deletions scripts/android/build_roc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,20 @@ fi

case "$OSTYPE" in
darwin*)
export PATH="${ndk_root}/toolchains/llvm/prebuilt/darwin-$(uname -m)/bin:${PATH}"
toolchain="${ndk_root}/toolchains/llvm/prebuilt/darwin-$(uname -m)/bin"
;;
linux*)
export PATH="${ndk_root}/toolchains/llvm/prebuilt/linux-$(uname -m)/bin:${PATH}"
toolchain="${ndk_root}/toolchains/llvm/prebuilt/linux-$(uname -m)/bin"
;;
esac

if [ ! -d "$toolchain" ];
then
echo "Toolchain not found at $toolchain"
exit 1
fi
export PATH="${toolchain}:${PATH}"

target_host=(
"aarch64-linux-android"
"armv7a-linux-androideabi"
Expand Down