Changed SrcDirs to SourceFiles and other things to try and fix build.

alexfern · alexfern · commit 01f49ec6397a · 2018-09-18T00:46:36.000-07:00
diff --git a/CommonCode/build.gradle b/CommonCode/build.gradle
@@ -14,21 +14,16 @@ android {
     }
     buildTypes {
         release {
+            debuggable true
             ndk {
                 abiFilters "armeabi-v7a"
             }
-
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
+            debuggable true
             ndk {
                 abiFilters "armeabi-v7a"
             }
-
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            useProguard false
         }
     }
     compileOptions {
@@ -57,7 +52,7 @@ task sourcesJar(type: Jar) {
 
 task javadoc(type: Javadoc) {
     failOnError false
-    source = android.sourceSets.main.java.srcDirs
+    source = android.sourceSets.main.java.sourceFiles
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
     classpath += configurations.compile
 }

Original file line number	Diff line number	Diff line change
`@@ -14,21 +14,16 @@ android {`
`14`	`14`	`}`
`15`	`15`	`buildTypes {`
`16`	`16`	`release {`
	`17`	`+ debuggable true`
`17`	`18`	`ndk {`
`18`	`19`	`abiFilters "armeabi-v7a"`
`19`	`20`	`}`
`20`		`-`
`21`		`- minifyEnabled true`
`22`		`- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`23`	`21`	`}`
`24`	`22`	`debug {`
	`23`	`+ debuggable true`
`25`	`24`	`ndk {`
`26`	`25`	`abiFilters "armeabi-v7a"`
`27`	`26`	`}`
`28`		`-`
`29`		`- minifyEnabled true`
`30`		`- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`31`		`- useProguard false`
`32`	`27`	`}`
`33`	`28`	`}`
`34`	`29`	`compileOptions {`
`@@ -57,7 +52,7 @@ task sourcesJar(type: Jar) {`
`57`	`52`
`58`	`53`	`task javadoc(type: Javadoc) {`
`59`	`54`	`failOnError false`
`60`		`- source = android.sourceSets.main.java.srcDirs`
	`55`	`+ source = android.sourceSets.main.java.sourceFiles`
`61`	`56`	`classpath += project.files(android.getBootClasspath().join(File.pathSeparator))`
`62`	`57`	`classpath += configurations.compile`
`63`	`58`	`}`