summaryrefslogtreecommitdiffstats
path: root/NativeApp/Android
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2021-01-04 00:21:33 +0000
committerassiduous <assiduous@diligentgraphics.com>2021-01-04 00:21:33 +0000
commit8c76e753bea2685b9549e0da28fd2995a26619c2 (patch)
treeefafc9825efe34587abe6120f72bb3e9e99015bb /NativeApp/Android
parentReadme: updated Contributing section (diff)
downloadDiligentTools-8c76e753bea2685b9549e0da28fd2995a26619c2.tar.gz
DiligentTools-8c76e753bea2685b9549e0da28fd2995a26619c2.zip
Reverted local changes to build.gradle
Diffstat (limited to 'NativeApp/Android')
-rw-r--r--NativeApp/Android/build.gradle9
1 files changed, 1 insertions, 8 deletions
diff --git a/NativeApp/Android/build.gradle b/NativeApp/Android/build.gradle
index f6cf7c1..0cb0011 100644
--- a/NativeApp/Android/build.gradle
+++ b/NativeApp/Android/build.gradle
@@ -4,7 +4,6 @@ apply from: "android_common.gradle"
// The arcore aar library contains the native shared libraries. These are
// extracted before building to a temporary directory.
def arcore_libpath = "${buildDir}/arcore-native"
-def ndk_dir = android.ndkDirectory
android {
defaultConfig {
@@ -14,7 +13,7 @@ android {
}
externalNativeBuild {
cmake {
- arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static", "-DARCORE_LIBPATH=${arcore_libpath}/jni", "-DARCORE_INCLUDE=${project.projectDir}/arcore_sdk/include", "-DPYTHON_EXECUTABLE=C:/Users/Egor/AppData/Local/Programs/Python/Python36/python.exe"
+ arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static", "-DARCORE_LIBPATH=${arcore_libpath}/jni", "-DARCORE_INCLUDE=${project.projectDir}/arcore_sdk/include"
}
}
}
@@ -30,12 +29,6 @@ android {
sourceSets {
main {
java.srcDirs = ['src/main/java', 'ndk_helper/src/java']
- jniLibs {
- // Gradle includes libraries in the following path as dependencies
- // of your CMake or ndk-build project so that they are packaged in
- // your app's APK.
- srcDir "${ndk_dir}/sources/third_party/vulkan/src/build-android/jniLibs"
- }
}
}