Fixed conflicting Android.mk issue

mta452 · mta452 · commit 5bf7fb90b1af · 2018-08-08T16:00:04.000+05:00
diff --git a/tehreer-android/build.gradle b/tehreer-android/build.gradle
@@ -43,12 +43,6 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
-    externalNativeBuild {
-        ndkBuild {
-            path 'src/main/jni/Android.mk'
-        }
-    }
-
     sourceSets {
         androidTest {
             externalNativeBuild {
@@ -57,6 +51,13 @@ android {
                 }
             }
         }
+        main {
+            externalNativeBuild {
+                ndkBuild {
+                    path 'src/main/jni/Android.mk'
+                }
+            }
+        }
     }
 
     buildTypes {

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,6 @@ android {`
`43`	`43`	`testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
`44`	`44`	`}`
`45`	`45`
`46`		`- externalNativeBuild {`
`47`		`- ndkBuild {`
`48`		`- path 'src/main/jni/Android.mk'`
`49`		`- }`
`50`		`- }`
`51`		`-`
`52`	`46`	`sourceSets {`
`53`	`47`	`androidTest {`
`54`	`48`	`externalNativeBuild {`
`@@ -57,6 +51,13 @@ android {`
`57`	`51`	`}`
`58`	`52`	`}`
`59`	`53`	`}`
	`54`	`+ main {`
	`55`	`+ externalNativeBuild {`
	`56`	`+ ndkBuild {`
	`57`	`+ path 'src/main/jni/Android.mk'`
	`58`	`+ }`
	`59`	`+ }`
	`60`	`+ }`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`buildTypes {`