Skip to content

Commit 85720c6

Browse files
committed
example app - updated to work with ndk 25 and current android studio
1 parent a03e5ec commit 85720c6

9 files changed

+46
-26
lines changed

do.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export NDK_DIR=$(pwd)/../down/ndk/25
2222
export ABI_NAMES="arm64-v8a armeabi-v7a x86 x86_64"
2323

2424
# Whether to build boost as dynamic or shared libraries (or both)
25-
export LINKAGES="shared static" # can be "shared" or "static" or "shared static" (both)
25+
export LINKAGES="" #shared static" # can be "shared" or "static" or "shared static" (both)
2626

2727

2828
#----------------------------------------------------------------

example_app/.idea/compiler.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example_app/.idea/gradle.xml

+3-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example_app/.idea/jarRepositories.xml

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example_app/.idea/misc.xml

+5-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example_app/.idea/runConfigurations.xml

-12
This file was deleted.

example_app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.5.3'
10+
classpath 'com.android.tools.build:gradle:7.2.1'
1111

1212

1313
// NOTE: Do not place your application dependencies here; they belong

example_app/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

example_app/local.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Location of the SDK. This is only used by Gradle.
55
# For customization when using a Version Control System, please read the
66
# header note.
7-
#Fri Jan 31 15:12:14 CET 2020
8-
ndk.dir=/home/declan/Documents/zone/mid/bin/android/sdk/ndk/21.0.6113669
9-
boost.dir=/home/declan/Documents/zone/low/boost/Boost-for-Android/build/ndk_21_boost_1.72.0
10-
sdk.dir=/home/declan/Documents/zone/mid/bin/android/sdk
7+
#Sun Jul 24 02:23:05 CEST 2022
8+
sdk.dir=/Users/declan/Library/Android/sdk
9+
ndk.dir=/Users/declan/Documents/zone/low/boost/down/ndk/25
10+
boost.dir=/Users/declan/Documents/zone/low/boost/Boost-for-Android/build/install

0 commit comments

Comments
 (0)