Skip to content

Commit

Permalink
example_app and screenshot updated.
Browse files Browse the repository at this point in the history
  • Loading branch information
dec1 committed Jan 31, 2020
1 parent e1d6388 commit e83eac8
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 16 deletions.
10 changes: 7 additions & 3 deletions example_app/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions example_app/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@ android {
]
}
}

compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}
buildToolsVersion = '29.0.3'


}
Expand All @@ -85,7 +89,7 @@ dependencies {
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:design:28.0.0'
testImplementation 'org.mockito:mockito-core:1.10.19'
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
}
Expand Down
2 changes: 1 addition & 1 deletion example_app/app/src/main/cpp/native-lib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Java_com_example_declan_myapplication_MainActivity_stringFromJNI(
JNIEnv *env,
jobject /* this */) {

string Str = "Hello from C++";
string Str = "Hello from C++\n";

//-------------------------------------
boost::chrono::system_clock::time_point p = boost::chrono::system_clock::now();
Expand Down
2 changes: 1 addition & 1 deletion example_app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.android.tools.build:gradle:3.5.3'


// NOTE: Do not place your application dependencies here; they belong
Expand Down
13 changes: 4 additions & 9 deletions example_app/local.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Fri Mar 22 15:38:23 CET 2019



sdk.dir=/home/declan/zone/mid/lib/android/sdk
ndk.dir=/home/declan/zone/low/boost/down/ndk/20

# boost install dir: should directly contain "include", "libs" subdirs
boost.dir=/home/declan/zone/low/boost/Boost-for-Android/build/install
#Fri Jan 31 15:12:14 CET 2020
ndk.dir=/home/declan/Documents/zone/mid/bin/android/sdk/ndk/21.0.6113669
boost.dir=/home/declan/Documents/zone/low/boost/Boost-for-Android/build/ndk_21_boost_1.72.0
sdk.dir=/home/declan/Documents/zone/mid/bin/android/sdk
Binary file modified example_app/screenshot.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e83eac8

Please sign in to comment.