Skip to content

Commit

Permalink
Move singing parameter (#12)
Browse files Browse the repository at this point in the history
* add iPerf3.17.1 support

* move keyStoreProperties to android/key.properties

* add default keystore
  • Loading branch information
hajoha authored Jun 3, 2024
1 parent b702a43 commit 98dccef
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,6 @@ lint/tmp/

# Android Profiling
*.hprof

android/key.propierties
*.so
20 changes: 18 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,27 @@ plugins {
id("org.spdx.sbom") version "0.7.0"
}

def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('android/key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
} else {
project.logger.warn("File not found: ${keystorePropertiesFile}")
project.logger.warn("Using default values for signing config.")
keystoreProperties['keyAlias'] = "omnt_default"
keystoreProperties['keyPassword'] = "omnt2024"
keystoreProperties['storeFile'] = file("omnt_default.jks")
keystoreProperties['storePassword'] = "omnt2024"
}


android {
signingConfigs {
debug {
storeFile file('OpenMobileNetworkToolkit-key.jks')
keyAlias 'key0'
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}
compileSdk 34
Expand Down
Binary file added app/omnt_default.jks
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ public class Iperf3LibLoader {
"iperf3.11",
"iperf3.12",
"iperf3.15",
"iperf3.16"
"iperf3.16",
"iperf3.17.1"
);

protected static synchronized void load() {
Expand Down

0 comments on commit 98dccef

Please sign in to comment.