improve to detect ndk

README.md

@@ -56,7 +56,7 @@ XMake installed on the system. Available [here](https://github.com/xmake-io/xmak
 
 ```
 plugins {
-  id 'org.tboox.gradle-xmake-plugin' version '1.0.9'
+  id 'org.tboox.gradle-xmake-plugin' version '1.1.0'
 }
 ```
 
@@ -70,7 +70,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath 'org.tboox:gradle-xmake-plugin:1.0.9'
+    classpath 'org.tboox:gradle-xmake-plugin:1.1.0'
   }
   repositories {
     mavenCentral()

README_zh.md

@@ -56,7 +56,7 @@ xmake-gradle是一个无缝整合xmake的gradle插件。
 
 ```
 plugins {
-  id 'org.tboox.gradle-xmake-plugin' version '1.0.9'
+  id 'org.tboox.gradle-xmake-plugin' version '1.1.0'
 }
 ```
 
@@ -70,7 +70,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath 'org.tboox:gradle-xmake-plugin:1.0.9'
+    classpath 'org.tboox:gradle-xmake-plugin:1.1.0'
   }
   repositories {
     mavenCentral()

gradle-xmake-plugin/build.gradle

@@ -8,7 +8,7 @@ plugins {
 apply plugin: 'groovy'
 
 group = "org.tboox"
-version = "1.0.9"
+version = "1.1.0"
 
 repositories {
     // Use jcenter for resolving your dependencies.

gradle-xmake-plugin/src/main/groovy/org/tboox/gradle/XMakeTaskContext.groovy

@@ -75,6 +75,21 @@ class XMakeTaskContext {
         if (ndk != null) {
             return new File(ndk).absoluteFile
         }
+
+        def androidExtension = project.getProperties().get("android")
+        if (androidExtension != null) {
+            if (androidExtension instanceof LibraryExtension) {
+                LibraryExtension libraryExtension = androidExtension
+                if (libraryExtension.ndkDirectory != null && libraryExtension.ndkDirectory.exists()) {
+                    return libraryExtension.ndkDirectory.absoluteFile
+                }
+            } else if (androidExtension instanceof AppExtension) {
+                AppExtension appExtension = androidExtension
+                if (appExtension.ndkDirectory != null && appExtension.ndkDirectory.exists()) {
+                    return appExtension.ndkDirectory.absoluteFile
+                }
+            }
+        }
         return null
     }
 

nativelib/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.tboox.gradle-xmake-plugin' version '1.0.9'
+    id 'org.tboox.gradle-xmake-plugin' version '1.1.0'
 }
 
 apply plugin: 'com.android.library'