Skip to content

Commit bde2703

Browse files
committed
Android: update example Android Studio project file, update CMakeLists.txt with FIPS Ready and spmath support
1 parent 60887c6 commit bde2703

11 files changed

Lines changed: 305 additions & 122 deletions

File tree

IDE/Android/.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

IDE/Android/.idea/gradle.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

IDE/Android/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

IDE/Android/.idea/vcs.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

IDE/Android/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,12 @@ located in the wolfssljni/IDE directory.
123123
This will ask for permissions to access the certificates in the /sdcard/
124124
directory and then print out the server certificate information on success.
125125

126-
3) OPTIONAL: The androidTests can be run after permissions has been given.
126+
3) OPTIONAL: The androidTests can be run after permissions have been given.
127127
app->java->com.wolfssl->provider.jsse.test->WolfSSLJSSETestSuite and
128-
app->java->com.wolfssl->test->WolfSSLTestSuite
128+
app->java->com.wolfssl->test->WolfSSLTestSuite. In order to get the correct
129+
permissions, you may need to install and run the app first, before running
130+
the tests. Otherwise you will see EACCESS errors when trying to open
131+
example certificate and .bks files.
129132

130133
## Support
131134

IDE/Android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ android {
2626
path "src/main/cpp/CMakeLists.txt"
2727
}
2828
}
29+
namespace 'com.example.wolfssl'
2930
}
3031

3132
dependencies {

IDE/Android/app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.example.wolfssl">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
54
<uses-permission android:name="android.permission.INTERNET"/>
65

@@ -10,7 +9,9 @@
109
android:label="@string/app_name"
1110
android:roundIcon="@mipmap/ic_launcher_round"
1211
android:supportsRtl="true"
13-
android:theme="@style/AppTheme">
12+
android:theme="@style/AppTheme"
13+
android:requestLegacyExternalStorage="true"
14+
android:preserveLegacyExternalStorage="true">
1415
<activity android:name=".MainActivity">
1516
<intent-filter>
1617
<action android:name="android.intent.action.MAIN" />

IDE/Android/app/src/main/cpp/CMakeLists.txt

Lines changed: 286 additions & 110 deletions
Large diffs are not rendered by default.

IDE/Android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77

88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.1.3'
10+
classpath 'com.android.tools.build:gradle:8.3.1'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

IDE/Android/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
# http://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
9+
android.defaults.buildfeatures.buildconfig=true
10+
android.nonFinalResIds=false
11+
android.nonTransitiveRClass=false
912
org.gradle.jvmargs=-Xmx1536m
1013
# When configured, Gradle will run in incubating parallel mode.
1114
# This option should only be used with decoupled projects. More details, visit

0 commit comments

Comments
 (0)