Merge pull request #19 from ignite720/ndk_version

Added android.ndkVersion support.
polymonster · Mar 13, 2024 · 2e1892a · 2e1892a
2 parents 7508f56 + 006ce04
commit 2e1892a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/android_studio/_preload.lua b/android_studio/_preload.lua
@@ -239,6 +239,13 @@ p.api.register
     kind = "string"
 }
 
+p.api.register 
+{
+    name = "androidndkversion",
+    scope = "project",
+    kind = "string"
+}
+
 p.api.register 
 {
     name = "assetpacks",

diff --git a/android_studio/android_studio.lua b/android_studio/android_studio.lua
@@ -492,6 +492,17 @@ function m.generate_project(prj)
     if prj.androidndkpath ~= nil then
         p.x('ndkPath \"%s\"', prj.androidndkpath)
     end
+
+    if prj.androidndkversion ~= nil then
+        p.x('ndkVersion \"%s\"', prj.androidndkversion)
+    else
+        if prj.androidndkpath ~= nil then
+            local _, _, ndk_version = string.find(prj.androidndkpath, "ndk/(.+)")
+            if ndk_version ~= nil then
+                p.x('ndkVersion \"%s\"', ndk_version)
+            end
+        end
+    end
 
     p.push('defaultConfig {')
     if prj.androidappid then