Reverted local changes to build.gradle

TheMostDiligent · TheMostDiligent · commit 8c76e753bea2 · 2021-01-03T16:21:33.000-08:00
diff --git 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"
-            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ apply from: "android_common.gradle"`
`4`	`4`	`// The arcore aar library contains the native shared libraries. These are`
`5`	`5`	`// extracted before building to a temporary directory.`
`6`	`6`	`def arcore_libpath = "${buildDir}/arcore-native"`
`7`		`-def ndk_dir = android.ndkDirectory`
`8`	`7`
`9`	`8`	`android {`
`10`	`9`	`defaultConfig {`
`@@ -14,7 +13,7 @@ android {`
`14`	`13`	`}`
`15`	`14`	`externalNativeBuild {`
`16`	`15`	`cmake {`
`17`		`- 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"`
	`16`	`+ arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static", "-DARCORE_LIBPATH=${arcore_libpath}/jni", "-DARCORE_INCLUDE=${project.projectDir}/arcore_sdk/include"`
`18`	`17`	`}`
`19`	`18`	`}`
`20`	`19`	`}`
`@@ -30,12 +29,6 @@ android {`
`30`	`29`	`sourceSets {`
`31`	`30`	`main {`
`32`	`31`	`java.srcDirs = ['src/main/java', 'ndk_helper/src/java']`
`33`		`- jniLibs {`
`34`		`- // Gradle includes libraries in the following path as dependencies`
`35`		`- // of your CMake or ndk-build project so that they are packaged in`
`36`		`- // your app's APK.`
`37`		`- srcDir "${ndk_dir}/sources/third_party/vulkan/src/build-android/jniLibs"`
`38`		`- }`
`39`	`32`	`}`
`40`	`33`	`}`
`41`	`34`