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

Minor fixes #108

Merged
merged 3 commits into from
May 13, 2023
Merged

Minor fixes #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a86200
Remove versionCode and versionName from AAR
gavv May 13, 2023
c65de68
Cleanup in scripts
gavv May 13, 2023
b9d8c73
Update README
gavv May 13, 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 @@ -144,7 +144,7 @@ This will start emulator inside docker and run tests on it:

First, export required environment variables:
```
export API=28
export API=26
export NDK_VERSION=21.1.6352462
export BUILD_TOOLS_VERSION=28.0.3
export CMAKE_VERSION=3.10.2.4988404
Expand Down Expand Up @@ -230,7 +230,7 @@ To remove build results and docker container, run:
If desired, you can export some variables for Android environment configuration; each variable has default value and is optional:
```
export JAVA_VERSION=8
export API=28
export API=26
export NDK_VERSION=21.1.6352462
export BUILD_TOOLS_VERSION=28.0.3
export CMAKE_VERSION=3.10.2.4988404
Expand Down
2 changes: 0 additions & 2 deletions android/roc-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ android {
defaultConfig {
minSdkVersion 26
targetSdkVersion "${apiLevel}".toInteger()
versionCode 1
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArgument "runnerBuilder", "de.mannodermaus.junit5.AndroidJUnit5Builder"
Expand Down
4 changes: 2 additions & 2 deletions scripts/android/start_emulator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

set -euxo pipefail

export PATH="$ANDROID_SDK_ROOT/tools/bin:${PATH}"
export PATH="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:${PATH}"
export PATH="${ANDROID_SDK_ROOT}/tools/bin:${PATH}"
export PATH="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${PATH}"

# create avd if it doesn't exist
if ! avdmanager list avd -c | grep -qF roc_device
Expand Down
2 changes: 1 addition & 1 deletion scripts/android_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function run_cmd() {

# setup default values
: "${JAVA_VERSION:=8}"
: "${API:=28}"
: "${API:=26}"
: "${NDK_VERSION:=21.1.6352462}"
: "${BUILD_TOOLS_VERSION:=28.0.3}"
: "${CMAKE_VERSION:=3.10.2.4988404}"
Expand Down