Merge branch 'QuadTriangle-patch-2'

inclement · inclement · commit 5539b010d032 · 2018-01-19T00:22:21.000Z
diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.gradle b/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.gradle
@@ -50,17 +50,17 @@ android {
 		}
 	}
 
-    sourceSets {
-        main {
-            jniLibs.srcDir 'libs' 
-            }
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
+    sourceSets {
+        main {
+            jniLibs.srcDir 'libs'
+            }
+    }
+
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -50,17 +50,17 @@ android {`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- sourceSets {`
`54`		`- main {`
`55`		`- jniLibs.srcDir 'libs'`
`56`		`- }`
`57`		`- }`
`58`		`-`
`59`	`53`	`compileOptions {`
`60`	`54`	`sourceCompatibility JavaVersion.VERSION_1_7`
`61`	`55`	`targetCompatibility JavaVersion.VERSION_1_7`
`62`	`56`	`}`
`63`	`57`
	`58`	`+ sourceSets {`
	`59`	`+ main {`
	`60`	`+ jniLibs.srcDir 'libs'`
	`61`	`+ }`
	`62`	`+ }`
	`63`	`+`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`dependencies {`