WIP: moving files, adding a test activity
This commit is contained in:
		
							parent
							
								
									1780a8942d
								
							
						
					
					
						commit
						e0dca174be
					
				|  | @ -30,7 +30,7 @@ android { | |||
|     sourceSets { | ||||
|         main { | ||||
|             // let gradle pack the shared library into apk | ||||
|             jniLibs.srcDirs = ['libs/wolfssl-jni'] | ||||
|             jniLibs.srcDirs = ['lib/wolfssl-jni'] | ||||
|         } | ||||
|     } | ||||
|     // externalNativeBuild { | ||||
|  | @ -57,8 +57,9 @@ task copyLibs(type: Copy) { | |||
| } | ||||
| 
 | ||||
| dependencies { | ||||
|     // testImplementation 'junit:junit:4.12' | ||||
|     implementation project(":wolfssl-jni") | ||||
|     implementation 'com.android.support:appcompat-v7:28.0.0' | ||||
|     // testImplementation 'junit:junit:4.12' | ||||
| } | ||||
| 
 | ||||
| // tasks.whenTaskAdded { task -> | ||||
|  |  | |||
|  | @ -6,6 +6,9 @@ package io.malloc.ccc; | |||
| import android.support.v7.app.AppCompatActivity; | ||||
| import android.os.Bundle; | ||||
| import android.widget.TextView; | ||||
| 
 | ||||
| import com.wolfssl.wolfcrypt.Aes; | ||||
| 
 | ||||
| /* | ||||
|  * Simple Java UI to trigger jni function. It is exactly same as Java code | ||||
|  * in hello-jni. | ||||
|  | @ -23,5 +26,6 @@ public class MainActivity extends AppCompatActivity { | |||
|     static { | ||||
|         System.loadLibrary("wolfssl-jni"); | ||||
|     } | ||||
| 
 | ||||
| } | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
|  | @ -0,0 +1,16 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     android:paddingBottom="@dimen/activity_vertical_margin" | ||||
|     android:paddingLeft="@dimen/activity_horizontal_margin" | ||||
|     android:paddingRight="@dimen/activity_horizontal_margin" | ||||
|     android:paddingTop="@dimen/activity_vertical_margin" | ||||
|     tools:context="com.example.hellolibs.MainActivity"> | ||||
| 
 | ||||
|     <TextView | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:text="Hello World!" /> | ||||
| </RelativeLayout> | ||||
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 3.3 KiB | 
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 2.2 KiB | 
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 4.7 KiB | 
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 7.5 KiB | 
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 10 KiB | 
|  | @ -0,0 +1,6 @@ | |||
| <resources> | ||||
|     <!-- Example customization of dimensions originally defined in res/values/dimens.xml | ||||
|          (such as screen margins) for screens with more than 820dp of available width. This | ||||
|          would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). --> | ||||
|     <dimen name="activity_horizontal_margin">64dp</dimen> | ||||
| </resources> | ||||
|  | @ -0,0 +1,6 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <resources> | ||||
|     <color name="colorPrimary">#3F51B5</color> | ||||
|     <color name="colorPrimaryDark">#303F9F</color> | ||||
|     <color name="colorAccent">#FF4081</color> | ||||
| </resources> | ||||
|  | @ -0,0 +1,5 @@ | |||
| <resources> | ||||
|     <!-- Default screen margins, per the Android Design guidelines. --> | ||||
|     <dimen name="activity_horizontal_margin">16dp</dimen> | ||||
|     <dimen name="activity_vertical_margin">16dp</dimen> | ||||
| </resources> | ||||
|  | @ -1,3 +1,3 @@ | |||
| <resources> | ||||
|     <string name="app_name">Copius Cipher Chain</string> | ||||
|     <string name="app_name">hello-libs</string> | ||||
| </resources> | ||||
|  |  | |||
|  | @ -0,0 +1,11 @@ | |||
| <resources> | ||||
| 
 | ||||
|     <!-- Base application theme. --> | ||||
|     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> | ||||
|         <!-- Customize your theme here. --> | ||||
|         <item name="colorPrimary">@color/colorPrimary</item> | ||||
|         <item name="colorPrimaryDark">@color/colorPrimaryDark</item> | ||||
|         <item name="colorAccent">@color/colorAccent</item> | ||||
|     </style> | ||||
| 
 | ||||
| </resources> | ||||
|  | @ -1,3 +1,5 @@ | |||
| include ':wolfssl-lib' | ||||
| include ':wolfssl-jni' | ||||
| // include this at the top, for shared libraries | ||||
| include ':ccc-jni', ':wolfssl-jni' | ||||
| // include ':wolfssl-lib' | ||||
| // include ':wolfssl-jni' | ||||
| include ':ccc-jni' | ||||
|  |  | |||
|  | @ -6,6 +6,7 @@ android { | |||
|     buildToolsVersion '28.0.3' | ||||
| 
 | ||||
|     defaultConfig { | ||||
|         // no applicationId with a library | ||||
|         // applicationId 'xyz.nc.android.wc' | ||||
|         minSdkVersion 23 | ||||
|         targetSdkVersion 28 | ||||
|  | @ -45,5 +46,5 @@ task copyLibs(type: Copy) { | |||
| 
 | ||||
| 
 | ||||
| dependencies { | ||||
|     testImplementation 'junit:junit:4.12' | ||||
|     // testImplementation 'junit:junit:4.12' | ||||
| } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 JohnE
						JohnE