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

Jump to bottom

Update to Android 14 #1856

Merged
merged 4 commits into from
Oct 11, 2023
Merged

Update to Android 14 #1856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24caa9e
update to android 14
robertwu1 Jul 12, 2023
b5a497c
Merge branch 'main' into robertwu/updatetoandroid14
robertwu1 Oct 4, 2023
04f49b4
update device id
robertwu1 Oct 6, 2023
1646744
rename device id
robertwu1 Oct 6, 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 apps/OboeTester/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId = "com.mobileer.oboetester"
minSdkVersion 23
targetSdkVersion 33
targetSdkVersion 34
versionCode 78
versionName "2.5.7"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down
2 changes: 1 addition & 1 deletion apps/OboeTester/app/src/main/cpp/jni-bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ Java_com_mobileer_oboetester_TestColdStartLatencyActivity_getColdStartTimeMicros
}

JNIEXPORT jint JNICALL
Java_com_mobileer_oboetester_TestColdStartLatencyActivity_getDeviceId(
Java_com_mobileer_oboetester_TestColdStartLatencyActivity_getAudioDeviceId(
JNIEnv *env, jobject instance) {
return sColdStartLatency.getDeviceId();
}
Expand Down
4 changes: 2 additions & 2 deletions apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestColdStartLatencyActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void run() {
try {
sleep(closedSleepTimeMillis);
openStream(useInput, useLowLatency, useMmap, useExclusive);
log("-------#" + loopCount + " Device Id: " + getDeviceId());
log("-------#" + loopCount + " Device Id: " + getAudioDeviceId());
log("open() Latency: " + getOpenTimeMicros() / 1000 + " msec");
sleep(openSleepTimeMillis);
startStream();
Expand Down Expand Up @@ -185,7 +185,7 @@ private native int openStream(boolean useInput, boolean useLowLatency, boolean u
private native int getOpenTimeMicros();
private native int getStartTimeMicros();
private native int getColdStartTimeMicros();
private native int getDeviceId();
private native int getAudioDeviceId();

@Override
public void onPause() {
Expand Down
4 changes: 2 additions & 2 deletions apps/fxlab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 33
compileSdkVersion 34
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
defaultConfig {
applicationId "com.mobileer.androidfxlab"
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
4 changes: 2 additions & 2 deletions samples/LiveEffect/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
applicationId 'com.google.oboe.samples.liveeffect'
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName '1.0'
ndk {
Expand Down
4 changes: 2 additions & 2 deletions samples/MegaDrone/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.oboe.samples.megadrone"
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
4 changes: 2 additions & 2 deletions samples/RhythmGame/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.oboe.samples.rhythmgame"
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
4 changes: 2 additions & 2 deletions samples/SoundBoard/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ plugins {
}

android {
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.oboe.samples.soundboard"
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
4 changes: 2 additions & 2 deletions samples/audio-device/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
}
buildTypes {
release {
Expand Down
4 changes: 2 additions & 2 deletions samples/drumthumper/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'org.jetbrains.kotlin.android'
}
android {
compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
// Usually the applicationId follows the same scheme as the application package name,
Expand All @@ -13,7 +13,7 @@ android {
// who publishes using the application Id prefix of "com.plausiblesoftware".
applicationId "com.plausiblesoftware.drumthumper"
minSdkVersion 23
targetSdkVersion 33
targetSdkVersion 34
versionCode 2
versionName "1.01"

Expand Down
4 changes: 2 additions & 2 deletions samples/hello-oboe/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
applicationId 'com.google.oboe.samples.hellooboe'
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName '1.0'
externalNativeBuild {
Expand Down
4 changes: 2 additions & 2 deletions samples/iolib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
Expand Down
4 changes: 2 additions & 2 deletions samples/parselib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
4 changes: 2 additions & 2 deletions tests/UnitTestRunner/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
compileSdkVersion 34
defaultConfig {
applicationId "com.google.oboe.tests.unittestrunner"
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
}
Expand Down