Skip to content

Commit 5673077

Browse files
authored
Kotlin/remove iperf (#11)
* remove iperf from project * update libndt7 gradle compile options
1 parent d043c20 commit 5673077

File tree

615 files changed

+48
-205719
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

615 files changed

+48
-205719
lines changed

app/build.gradle

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ plugins {
99
id "kotlinx-serialization"
1010
}
1111

12-
def iperfkeyPropertiesFile = rootProject.file("iperfkey.properties")
13-
def iperfkeyProperties = new Properties()
14-
iperfkeyProperties.load(new FileInputStream(iperfkeyPropertiesFile))
15-
1612
android {
1713
compileSdkVersion 33
1814
buildToolsVersion "30.0.3"
@@ -29,12 +25,6 @@ android {
2925
arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
3026
}
3127
}
32-
ndk {
33-
abiFilters 'armeabi-v7a', 'arm64-v8a', "x86", "x86_64"
34-
}
35-
36-
buildConfigField("String", "USERNAME", iperfkeyProperties['USERNAME'])
37-
buildConfigField("String", "PASSWORD", iperfkeyProperties['PASSWORD'])
3828

3929
// Required when setting minSdkVersion to 20 or lower according to <link>https://developer.android.com/studio/write/java8-support#library-desugaring</link>
4030
multiDexEnabled true
@@ -62,19 +52,16 @@ android {
6252
kotlinCompilerExtensionVersion "1.4.4"
6353
}
6454

65-
externalNativeBuild {
66-
cmake {
67-
path file("src/main/cpp/CMakeLists.txt")
68-
version '3.18.1'
69-
}
70-
}
7155
kotlinOptions {
7256
jvmTarget = '1.8'
7357
}
7458
}
7559

7660
dependencies {
7761
implementation project(":libndt7")
62+
63+
// implementation fileTree(dir: 'libs', include: ['*.jar'])
64+
7865
implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
7966
implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
8067
implementation 'androidx.core:core-ktx:1.9.0'
@@ -88,7 +75,6 @@ dependencies {
8875
implementation "androidx.hilt:hilt-work:1.0.0"
8976
kapt "androidx.hilt:hilt-compiler:1.0.0"
9077

91-
implementation fileTree(dir: 'libs', include: ['*.jar'])
9278
implementation 'androidx.appcompat:appcompat:1.3.0'
9379
implementation 'com.google.android.material:material:1.3.0'
9480
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'

app/src/main/cpp/Android.mk

Lines changed: 0 additions & 29 deletions
This file was deleted.

app/src/main/cpp/CMakeLists.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

app/src/main/cpp/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

app/src/main/cpp/include/common_jni_util.h

Lines changed: 0 additions & 23 deletions
This file was deleted.

app/src/main/cpp/include/iperf3_java_callback.h

Lines changed: 0 additions & 23 deletions
This file was deleted.

app/src/main/cpp/include/iperf3_jni_api.h

Lines changed: 0 additions & 23 deletions
This file was deleted.

app/src/main/cpp/include/iperf3_state_wrapper.h

Lines changed: 0 additions & 29 deletions
This file was deleted.

app/src/main/cpp/include/iperf_state_wrapper_interface.h

Lines changed: 0 additions & 62 deletions
This file was deleted.

app/src/main/cpp/libs/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)