Skip to content

Commit 98dccef

Browse files
authored
Move singing parameter (#12)
* add iPerf3.17.1 support * move keyStoreProperties to android/key.properties * add default keystore
1 parent b702a43 commit 98dccef

File tree

4 files changed

+23
-3
lines changed

4 files changed

+23
-3
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,6 @@ lint/tmp/
9797

9898
# Android Profiling
9999
*.hprof
100+
101+
android/key.propierties
102+
*.so

app/build.gradle

+18-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,27 @@ plugins {
1111
id("org.spdx.sbom") version "0.7.0"
1212
}
1313

14+
def keystoreProperties = new Properties()
15+
def keystorePropertiesFile = rootProject.file('android/key.properties')
16+
if (keystorePropertiesFile.exists()) {
17+
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
18+
} else {
19+
project.logger.warn("File not found: ${keystorePropertiesFile}")
20+
project.logger.warn("Using default values for signing config.")
21+
keystoreProperties['keyAlias'] = "omnt_default"
22+
keystoreProperties['keyPassword'] = "omnt2024"
23+
keystoreProperties['storeFile'] = file("omnt_default.jks")
24+
keystoreProperties['storePassword'] = "omnt2024"
25+
}
26+
27+
1428
android {
1529
signingConfigs {
1630
debug {
17-
storeFile file('OpenMobileNetworkToolkit-key.jks')
18-
keyAlias 'key0'
31+
keyAlias keystoreProperties['keyAlias']
32+
keyPassword keystoreProperties['keyPassword']
33+
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
34+
storePassword keystoreProperties['storePassword']
1935
}
2036
}
2137
compileSdk 34

app/omnt_default.jks

2.69 KB
Binary file not shown.

app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Iperf3LibLoader.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public class Iperf3LibLoader {
2323
"iperf3.11",
2424
"iperf3.12",
2525
"iperf3.15",
26-
"iperf3.16"
26+
"iperf3.16",
27+
"iperf3.17.1"
2728
);
2829

2930
protected static synchronized void load() {

0 commit comments

Comments
 (0)