SCDS/FTCRoadRunnerRobotics
7
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	FtcRobotController/src/main/AndroidManifest.xml
#	README.md
#	build.dependencies.gradle
This commit is contained in:
Zach Harel
2024-12-23 11:43:03 -05:00
parent 06431bb98f ee16f8e657
commit 917c794ef6
7 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.common.gradle
View File

@ -21,7 +21,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 29
compileSdkVersion 30
signingConfigs {
release {
@ -113,10 +113,6 @@ android {
packagingOptions {
pickFirst '**/*.so'
}
sourceSets.main {
jni.srcDirs = []
jniLibs.srcDir rootProject.file('libs')
}
ndkVersion '21.3.6528147'
}