Merge pull request #165 from Faless/bump/godot-cpp_4.1.3

[godot-cpp] Update versions and patches

.github/workflows/build_release.yml

@@ -4,6 +4,8 @@ on: [push, pull_request]
 env:
   # Only used for the cache key. Increment version to force clean build.
   GODOT_BASE_BRANCH: master
+  # Hardcoding this seem to be the only way
+  ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/23.2.8568313/
 
 jobs:
   static-checks:
@@ -187,7 +189,7 @@ jobs:
         if: ${{ matrix.platform == 'linux' }}
         run: |
           if [ ! -f ${{ matrix.buildroot }}.tar.bz2 ]; then
-            wget https://downloads.tuxfamily.org/godotengine/toolchains/linux/${{ matrix.buildroot }}.tar.bz2
+            wget https://github.com/godotengine/buildroot/releases/download/godot-2023.08.x-4/${{ matrix.buildroot }}.tar.bz2
           fi
           tar -xjf ${{ matrix.buildroot }}.tar.bz2
           ${{ matrix.buildroot }}/relocate-sdk.sh
@@ -196,10 +198,16 @@ jobs:
           patch -p1 < misc/patches/scons_path.diff
           patch -p1 < misc/patches/gdnantive_arm_warnings.diff
 
+      - name: Setup Android dependencies
+        if: ${{ matrix.platform  == 'android' }}
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r23c
+          link-to-sdk: true
+
       - name: Patch godot-cpp to support build profile.
         run: |
           patch -p1 < misc/patches/build_profile.diff
-          patch -p1 < misc/patches/build_profile_4.0.diff
           patch -p1 < misc/patches/build_profile_3.x.diff
 
       - name: Print tools versions
@@ -210,19 +218,11 @@ jobs:
 
       - name: Compile Extension (4.1+) - template_debug - ${{ matrix.platform }} - ${{ matrix.arch }}
         run: |
-          scons target=template_debug godot_version=4.1
+          scons target=template_debug godot_version=4
 
       - name: Compile Extension (4.1+) - template_release - ${{ matrix.platform }} - ${{ matrix.arch }}
         run: |
-          scons target=template_release godot_version=4.1
-
-      - name: Compile Extension (4.0) - template_debug - ${{ matrix.platform }} - ${{ matrix.arch }}
-        run: |
-          scons target=template_debug godot_version=4.0
-
-      - name: Compile Extension (4.0) - template_release - ${{ matrix.platform }} - ${{ matrix.arch }}
-        run: |
-          scons target=template_release godot_version=4.0
+          scons target=template_release godot_version=4
 
       - name: Compile GDNative (3.5+) - release ${{ matrix.platform }} - ${{ matrix.arch }}
         run: |
@@ -265,21 +265,15 @@ jobs:
         run: |
           mkdir release
 
-          VERSION="extension-4.1" TYPE="webrtc" ./misc/scripts/package_release.sh
-          VERSION="extension-4.0" TYPE="webrtc" ./misc/scripts/package_release.sh
+          VERSION="extension" TYPE="webrtc" ./misc/scripts/package_release.sh
           VERSION="gdnative" TYPE="webrtc" ./misc/scripts/package_release.sh
 
           ls -R release
 
       - uses: actions/upload-artifact@v4
         with:
-          name: godot-webrtc-extension-4.1
-          path: release/*-extension-4.1-*.zip
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: godot-webrtc-extension-4.0
-          path: release/*-extension-4.0-*.zip
+          name: godot-webrtc-extension
+          path: release/*-extension-*.zip
 
       - uses: actions/upload-artifact@v4
         with:

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "godot-cpp"]
 	path = godot-cpp
 	url = https://github.com/godotengine/godot-cpp.git
-[submodule "godot-cpp-4.0"]
-	path = godot-cpp-4.0
-	url = https://github.com/godotengine/godot-cpp.git
 [submodule "godot-cpp-3.x"]
 	path = godot-cpp-3.x
 	url = https://github.com/godotengine/godot-cpp.git

SConstruct

@@ -28,7 +28,7 @@ def validate_godotcpp_dir(key, val, env):
 
 env = Environment()
 opts = Variables(["customs.py"], ARGUMENTS)
-opts.Add(EnumVariable("godot_version", "The Godot target version", "4.1", ["3", "4.0", "4.1"]))
+opts.Add(EnumVariable("godot_version", "The Godot target version", "4", ["3", "4"], {"4.1+": "4", "4.1": "4"}))
 opts.Add(
     PathVariable(
         "godot_cpp",
@@ -122,10 +122,6 @@ if env["godot_version"] == "3":
     if env["platform"] == "linux" and env["arch"] not in ("x86_32", "x86_64"):
         for flags in (env["CCFLAGS"], env["LINKFLAGS"], cpp_env["CCFLAGS"], cpp_env["LINKFLAGS"]):
             replace_flags(flags, {"-m32": None, "-m64": None})
-elif env["godot_version"] == "4.0":
-    sconstruct = env.get("godot_cpp", "godot-cpp-4.0") + "/SConstruct"
-    cpp_env = SConscript(sconstruct)
-    env = cpp_env.Clone()
 else:
     sconstruct = env.get("godot_cpp", "godot-cpp") + "/SConstruct"
     cpp_env = SConscript(sconstruct)
@@ -160,10 +156,8 @@ opts.Update(env)
 target = env["target"]
 if env["godot_version"] == "3":
     result_path = os.path.join("bin", "gdnative", "webrtc" if env["target"] == "release" else "webrtc_debug")
-elif env["godot_version"] == "4.0":
-    result_path = os.path.join("bin", "extension-4.0", "webrtc")
 else:
-    result_path = os.path.join("bin", "extension-4.1", "webrtc")
+    result_path = os.path.join("bin", "extension", "webrtc")
 
 # Our includes and sources
 env.Append(CPPPATH=["src/"])
@@ -181,8 +175,6 @@ if env["godot_version"] == "3":
     add_sources(sources, "src/net/", "cpp")
 else:
     sources.append("src/init_gdextension.cpp")
-    if env["godot_version"] == "4.0":
-        env.Append(CPPDEFINES=["GDEXTENSION_WEBRTC_40"])
 
 # Add our build tools
 for tool in ["openssl", "cmake", "rtc"]:
@@ -249,10 +241,6 @@ if env["godot_version"] == "3":
         },
     )
 else:
-    extfile = env.Substfile(
-        os.path.join(result_path, "webrtc.gdextension"),
-        "misc/webrtc.gdextension",
-        SUBST_DICT={"{GODOT_VERSION}": env["godot_version"]},
-    )
+    extfile = env.InstallAs(os.path.join(result_path, "webrtc.gdextension"), "misc/webrtc.gdextension")
 
 Default(extfile)

misc/patches/build_profile.diff

@@ -1,67 +1,56 @@
-diff --git a/godot-cpp/SConstruct b/godot-cpp/SConstruct
-index 42f8fc0..9d59d1f 100644
---- a/godot-cpp/SConstruct
-+++ b/godot-cpp/SConstruct
-@@ -121,6 +121,14 @@ opts.Add(
-     BoolVariable("generate_bindings", "Force GDExtension API bindings generation. Auto-detected by default.", False)
- )
- opts.Add(BoolVariable("generate_template_get_node", "Generate a template version of the Node class's get_node.", True))
-+opts.Add(
-+    PathVariable(
-+        "build_profile",
-+        "Path to a file containing a feature build profile",
-+        default=env.get("build_profile", None),
-+        validator=lambda key, val, env: os.path.isfile(normalize_path(val)),
-+    )
-+)
- 
- opts.Add(BoolVariable("build_library", "Build the godot-cpp library.", True))
- opts.Add(EnumVariable("precision", "Set the floating-point precision level", "single", ("single", "double")))
 diff --git a/godot-cpp/binding_generator.py b/godot-cpp/binding_generator.py
-index d04c698..41cf29b 100644
+index 18db9fd..e0c8caf 100644
 --- a/godot-cpp/binding_generator.py
 +++ b/godot-cpp/binding_generator.py
-@@ -70,12 +70,14 @@ def generate_wrappers(target):
-         f.write(txt)
+@@ -72,9 +72,13 @@ def generate_wrappers(target):
  
- 
--def get_file_list(api_filepath, output_dir, headers=False, sources=False):
-+def get_file_list(api_filepath, output_dir, headers=False, sources=False, profile_filepath=""):
+ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
      api = {}
-     files = []
+-    files = []
      with open(api_filepath, encoding="utf-8") as api_file:
          api = json.load(api_file)
- 
-+    build_profile = parse_build_profile(profile_filepath, api)
++    return _get_file_list(api, output_dir, headers, sources)
 +
++
++def _get_file_list(api, output_dir, headers=False, sources=False):
++    files = []
+ 
      core_gen_folder = Path(output_dir) / "gen" / "include" / "godot_cpp" / "core"
      include_gen_folder = Path(output_dir) / "gen" / "include" / "godot_cpp"
-     source_gen_folder = Path(output_dir) / "gen" / "src"
-@@ -104,7 +106,7 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
-         source_filename = source_gen_folder / "classes" / (camel_to_snake(engine_class["name"]) + ".cpp")
-         if headers:
-             files.append(str(header_filename.as_posix()))
--        if sources:
-+        if sources and is_class_included(engine_class["name"], build_profile):
-             files.append(str(source_filename.as_posix()))
- 
-     for native_struct in api["native_structures"]:
-@@ -134,14 +136,107 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
-     return files
+@@ -158,13 +162,15 @@ def scons_generate_bindings(target, source, env):
+     return None
  
  
--def print_file_list(api_filepath, output_dir, headers=False, sources=False):
-+def print_file_list(api_filepath, output_dir, headers=False, sources=False, profile_filepath=""):
-     end = ";"
--    for f in get_file_list(api_filepath, output_dir, headers, sources):
-+    for f in get_file_list(api_filepath, output_dir, headers, sources, profile_filepath):
-         print(f, end=end)
- 
+-def generate_bindings(api_filepath, use_template_get_node, bits="64", precision="single", output_dir="."):
+-    api = None
+-
+-    target_dir = Path(output_dir) / "gen"
+-
++def _generate_bindings(api_filepath, use_template_get_node, bits="64", precision="single", output_dir="."):
++    api = {}
+     with open(api_filepath, encoding="utf-8") as api_file:
+         api = json.load(api_file)
++    _generate_bindings(api, use_template_get_node, bits, precision, output_dir)
++
++
++def _generate_bindings(api, use_template_get_node, bits="64", precision="single", output_dir="."):
++    target_dir = Path(output_dir) / "gen"
  
+     shutil.rmtree(target_dir, ignore_errors=True)
+     target_dir.mkdir(parents=True)
+diff --git a/godot-cpp/build_profile.py b/godot-cpp/build_profile.py
+new file mode 100644
+index 0000000..b4d19de
+--- /dev/null
++++ b/godot-cpp/build_profile.py
+@@ -0,0 +1,183 @@
++import json
++import sys
++
++
 +def parse_build_profile(profile_filepath, api):
 +    if profile_filepath == "":
 +        return {}
-+    print("Using feature build profile: " + profile_filepath)
 +
 +    with open(profile_filepath, encoding="utf-8") as profile_file:
 +        profile = json.load(profile_file)
@@ -79,30 +68,6 @@ index d04c698..41cf29b 100644
 +        children[parent] = children.get(parent, [])
 +        children[parent].append(child)
 +
-+    # Parse methods dependencies
-+    deps = {}
-+    reverse_deps = {}
-+    for name, engine_class in api_dict.items():
-+        ref_cls = set()
-+        for method in engine_class.get("methods", []):
-+            rtype = method.get("return_value", {}).get("type", "")
-+            args = [a["type"] for a in method.get("arguments", [])]
-+            if rtype in api_dict:
-+                ref_cls.add(rtype)
-+            elif is_enum(rtype) and get_enum_class(rtype) in api_dict:
-+                ref_cls.add(get_enum_class(rtype))
-+            for arg in args:
-+                if arg in api_dict:
-+                    ref_cls.add(arg)
-+                elif is_enum(arg) and get_enum_class(arg) in api_dict:
-+                    ref_cls.add(get_enum_class(arg))
-+        deps[engine_class["name"]] = set(filter(lambda x: x != name, ref_cls))
-+        for acls in ref_cls:
-+            if acls == name:
-+                continue
-+            reverse_deps[acls] = reverse_deps.get(acls, set())
-+            reverse_deps[acls].add(name)
-+
 +    included = []
 +    front = list(profile.get("enabled_classes", []))
 +    if front:
@@ -110,6 +75,12 @@ index d04c698..41cf29b 100644
 +        front.append("WorkerThreadPool")
 +        front.append("ClassDB")
 +        front.append("ClassDBSingleton")
++        # In src/classes/low_level.cpp
++        front.append("FileAccess")
++        front.append("Image")
++        front.append("XMLParser")
++        # In include/godot_cpp/templates/thread_work_pool.hpp
++        front.append("Semaphore")
 +    while front:
 +        cls = front.pop()
 +        if cls in included:
@@ -118,10 +89,6 @@ index d04c698..41cf29b 100644
 +        parent = parents.get(cls, "")
 +        if parent:
 +            front.append(parent)
-+        for rcls in deps.get(cls, set()):
-+            if rcls in included or rcls in front:
-+                continue
-+            front.append(rcls)
 +
 +    excluded = []
 +    front = list(profile.get("disabled_classes", []))
@@ -131,10 +98,6 @@ index d04c698..41cf29b 100644
 +            continue
 +        excluded.append(cls)
 +        front += children.get(cls, [])
-+        for rcls in reverse_deps.get(cls, set()):
-+            if rcls in excluded or rcls in front:
-+                continue
-+            front.append(rcls)
 +
 +    if included and excluded:
 +        print(
@@ -147,78 +110,40 @@ index d04c698..41cf29b 100644
 +    }
 +
 +
- def scons_emit_files(target, source, env):
--    files = [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True)]
-+    profile_filepath = env.get("build_profile", "")
-+    if profile_filepath and not Path(profile_filepath).is_absolute():
-+        profile_filepath = str((Path(env.Dir("#").abspath) / profile_filepath).as_posix())
++def generate_trimmed_api(source_api_filepath, profile_filepath):
++    with open(source_api_filepath, encoding="utf-8") as api_file:
++        api = json.load(api_file)
++
++    if profile_filepath == "":
++        return api
 +
-+    files = [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True, profile_filepath)]
-     env.Clean(target, files)
-     env["godot_cpp_gen_dir"] = target[0].abspath
-     return files, source
-@@ -154,11 +249,12 @@ def scons_generate_bindings(target, source, env):
-         "32" if "32" in env["arch"] else "64",
-         env["precision"],
-         env["godot_cpp_gen_dir"],
-+        env.get("build_profile", ""),
-     )
-     return None
- 
- 
--def generate_bindings(api_filepath, use_template_get_node, bits="64", precision="single", output_dir="."):
-+def generate_bindings(api_filepath, use_template_get_node, bits="64", precision="single", output_dir=".", profile_filepath=""):
-     api = None
- 
-     target_dir = Path(output_dir) / "gen"
-@@ -175,7 +271,7 @@ def generate_bindings(api_filepath, use_template_get_node, bits="64", precision=
-     generate_global_constants(api, target_dir)
-     generate_global_constant_binds(api, target_dir)
-     generate_builtin_bindings(api, target_dir, real_t + "_" + bits)
--    generate_engine_classes_bindings(api, target_dir, use_template_get_node)
-+    generate_engine_classes_bindings(api, target_dir, use_template_get_node, profile_filepath)
-     generate_utility_functions(api, target_dir)
- 
- 
-@@ -1023,7 +1119,7 @@ def generate_builtin_class_source(builtin_api, size, used_classes, fully_used_cl
-     return "\n".join(result)
- 
- 
--def generate_engine_classes_bindings(api, output_dir, use_template_get_node):
-+def generate_engine_classes_bindings(api, output_dir, use_template_get_node, profile_filepath=""):
-     global engine_classes
-     global singletons
-     global native_structures
-@@ -1161,7 +1257,7 @@ def generate_engine_classes_bindings(api, output_dir, use_template_get_node):
- 
-     register_engine_classes_filename = Path(output_dir) / "src" / "register_engine_classes.cpp"
-     with register_engine_classes_filename.open("w+", encoding="utf-8") as source_file:
--        source_file.write(generate_register_engine_classes_source(api))
-+        source_file.write(generate_register_engine_classes_source(api, profile_filepath))
- 
-     for native_struct in api["native_structures"]:
-         struct_name = native_struct["name"]
-@@ -1585,12 +1681,14 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
-     return "\n".join(result)
- 
- 
--def generate_register_engine_classes_source(api):
-+def generate_register_engine_classes_source(api, profile_filepath=""):
-     includes = []
-     registrations = []
- 
 +    build_profile = parse_build_profile(profile_filepath, api)
 +
-     for class_api in api["classes"]:
--        if class_api["name"] == "ClassDB":
-+        if class_api["name"] == "ClassDB" or not is_class_included(class_api["name"], build_profile):
-             continue
- 
-         class_name = class_api["name"]
-@@ -2066,6 +2164,20 @@ def is_pod_type(type_name):
-     ]
- 
- 
++    engine_classes = {}
++    for class_api in api["classes"]:
++        engine_classes[class_api["name"]] = class_api["is_refcounted"]
++    for native_struct in api["native_structures"]:
++        if native_struct["name"] == "ObjectID":
++            continue
++        engine_classes[native_struct["name"]] = False
++
++    classes = []
++    for class_api in api["classes"]:
++        if not is_class_included(class_api["name"], build_profile):
++            continue
++        if "methods" in class_api:
++            methods = []
++            for method in class_api["methods"]:
++                if not is_method_included(method, build_profile, engine_classes):
++                    continue
++                methods.append(method)
++            class_api["methods"] = methods
++        classes.append(class_api)
++    api["classes"] = classes
++
++    return api
++
++
 +def is_class_included(class_name, build_profile):
 +    """
 +    Check if an engine class should be included.
@@ -233,6 +158,140 @@ index d04c698..41cf29b 100644
 +    return True
 +
 +
- def is_included_type(type_name):
-     # Types which we already have implemented.
-     return is_included_struct_type(type_name) or type_name in ["ObjectID"]
++def is_method_included(method, build_profile, engine_classes):
++    """
++    Check if an engine class method should be included.
++    This removes methods according to a build profile of enabled or disabled classes.
++    """
++    included = build_profile.get("enabled_classes", [])
++    excluded = build_profile.get("disabled_classes", [])
++    ref_cls = set()
++    rtype = get_base_type(method.get("return_value", {}).get("type", ""))
++    args = [get_base_type(a["type"]) for a in method.get("arguments", [])]
++    if rtype in engine_classes:
++        ref_cls.add(rtype)
++    elif is_enum(rtype) and get_enum_class(rtype) in engine_classes:
++        ref_cls.add(get_enum_class(rtype))
++    for arg in args:
++        if arg in engine_classes:
++            ref_cls.add(arg)
++        elif is_enum(arg) and get_enum_class(arg) in engine_classes:
++            ref_cls.add(get_enum_class(arg))
++    for acls in ref_cls:
++        if len(included) > 0 and acls not in included:
++            return False
++        elif len(excluded) > 0 and acls in excluded:
++            return False
++    return True
++
++
++def is_enum(type_name):
++    return type_name.startswith("enum::") or type_name.startswith("bitfield::")
++
++
++def get_enum_class(enum_name: str):
++    if "." in enum_name:
++        if is_bitfield(enum_name):
++            return enum_name.replace("bitfield::", "").split(".")[0]
++        else:
++            return enum_name.replace("enum::", "").split(".")[0]
++    else:
++        return "GlobalConstants"
++
++
++def get_base_type(type_name):
++    if type_name.startswith("const "):
++        type_name = type_name[6:]
++    if type_name.endswith("*"):
++        type_name = type_name[:-1]
++    if type_name.startswith("typedarray::"):
++        type_name = type_name.replace("typedarray::", "")
++    return type_name
++
++
++def is_bitfield(type_name):
++    return type_name.startswith("bitfield::")
++
++
++if __name__ == "__main__":
++    if len(sys.argv) < 3 or len(sys.argv) > 4:
++        print("Usage: %s BUILD_PROFILE INPUT_JSON [OUTPUT_JSON]" % (sys.argv[0]))
++        sys.exit(1)
++    profile = sys.argv[1]
++    infile = sys.argv[2]
++    outfile = sys.argv[3] if len(sys.argv) > 3 else ""
++    api = generate_trimmed_api(infile, profile)
++
++    if outfile:
++        with open(outfile, "w", encoding="utf-8") as f:
++            json.dump(api, f)
++    else:
++        json.dump(api, sys.stdout)
+diff --git a/godot-cpp/tools/godotcpp.py b/godot-cpp/tools/godotcpp.py
+index efe632a..993aa81 100644
+--- a/godot-cpp/tools/godotcpp.py
++++ b/godot-cpp/tools/godotcpp.py
+@@ -5,7 +5,8 @@ from SCons.Tool import Tool
+ from SCons.Builder import Builder
+ from SCons.Errors import UserError
+ 
+-from binding_generator import scons_generate_bindings, scons_emit_files
++from binding_generator import _generate_bindings, _get_file_list, get_file_list
++from build_profile import generate_trimmed_api
+ 
+ 
+ def add_sources(sources, dir, extension):
+@@ -14,6 +15,37 @@ def add_sources(sources, dir, extension):
+             sources.append(dir + "/" + f)
+ 
+ 
++def scons_emit_files(target, source, env):
++    profile_filepath = env.get("build_profile", "")
++    if profile_filepath:
++        profile_filepath = normalize_path(profile_filepath, env)
++
++    # Always clean all files
++    env.Clean(target, [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True)])
++
++    api = generate_trimmed_api(str(source[0]), profile_filepath)
++    files = [env.File(f) for f in _get_file_list(api, target[0].abspath, True, True)]
++    env["godot_cpp_gen_dir"] = target[0].abspath
++    return files, source
++
++
++def scons_generate_bindings(target, source, env):
++    profile_filepath = env.get("build_profile", "")
++    if profile_filepath:
++        profile_filepath = normalize_path(profile_filepath, env)
++
++    api = generate_trimmed_api(str(source[0]), profile_filepath)
++
++    _generate_bindings(
++        api,
++        env["generate_template_get_node"],
++        "32" if "32" in env["arch"] else "64",
++        env["precision"],
++        env["godot_cpp_gen_dir"],
++    )
++    return None
++
++
+ def normalize_path(val, env):
+     return val if os.path.isabs(val) else os.path.join(env.Dir("#").abspath, val)
+ 
+@@ -175,6 +207,15 @@ def options(opts, env):
+         )
+     )
+ 
++    opts.Add(
++        PathVariable(
++            "build_profile",
++            "Path to a file containing a feature build profile",
++            default=env.get("build_profile", None),
++            validator=validate_file,
++        )
++    )
++
+     opts.Add(
+         BoolVariable(
+             "disable_exceptions",

misc/patches/build_profile_3.x.diff

@@ -1,8 +1,52 @@
 diff --git a/godot-cpp-3.x/SConstruct b/godot-cpp-3.x/SConstruct
-index f653d54..44f66a5 100644
+index f653d54..483f190 100644
 --- a/godot-cpp-3.x/SConstruct
 +++ b/godot-cpp-3.x/SConstruct
-@@ -170,6 +170,14 @@ opts.Add(
+@@ -3,7 +3,42 @@
+ import os
+ import sys
+ import subprocess
+-from binding_generator import scons_generate_bindings, scons_emit_files
++from binding_generator import _generate_bindings, _get_file_list, get_file_list
++from build_profile import generate_trimmed_api
++
++
++def normalize_path(val):
++    return val if os.path.isabs(val) else os.path.join(env.Dir("#").abspath, val)
++
++
++def scons_emit_files(target, source, env):
++    profile_filepath = env.get("build_profile", "")
++    if profile_filepath:
++        profile_filepath = normalize_path(profile_filepath)
++
++    # Always clean all files
++    env.Clean(target, [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True)])
++
++    api = generate_trimmed_api(str(source[0]), profile_filepath)
++    files = [env.File(f) for f in _get_file_list(api, target[0].abspath, True, True)]
++    env["godot_cpp_gen_dir"] = target[0].abspath
++    return files, source
++
++
++def scons_generate_bindings(target, source, env):
++    profile_filepath = env.get("build_profile", "")
++    if profile_filepath:
++        profile_filepath = normalize_path(profile_filepath)
++
++    api = generate_trimmed_api(str(source[0]), profile_filepath)
++
++    _generate_bindings(
++        api,
++        env["generate_template_get_node"],
++        env["godot_cpp_gen_dir"],
++    )
++    return None
++
+ 
+ if sys.version_info < (3,):
+ 
+@@ -170,6 +205,14 @@ opts.Add(
          True,
      )
  )
@@ -11,38 +55,65 @@ index f653d54..44f66a5 100644
 +        "build_profile",
 +        "Path to a file containing a feature build profile",
 +        default=env.get("build_profile", None),
-+        validator=lambda key, val, env: val if os.path.isabs(val) else os.path.join(env.Dir("#").abspath, val),
++        validator=lambda key, val, env: os.path.isfile(normalize_path(val)),
 +    )
 +)
  
  opts.Add(BoolVariable("build_library", "Build the godot-cpp library.", True))
  
 diff --git a/godot-cpp-3.x/binding_generator.py b/godot-cpp-3.x/binding_generator.py
-index da4bb61..e5bd040 100644
+index da4bb61..1348a51 100644
 --- a/godot-cpp-3.x/binding_generator.py
 +++ b/godot-cpp-3.x/binding_generator.py
-@@ -12,14 +12,115 @@ def correct_method_name(method_list):
-             method["name"] = "get_node_internal"
+@@ -16,10 +16,16 @@ classes = []
  
  
-+def is_class_included(class_name, build_profile):
-+    """
-+    Check if an engine class should be included.
-+    This removes classes according to a build profile of enabled or disabled classes.
-+    """
-+    included = build_profile.get("enabled_classes", [])
-+    excluded = build_profile.get("disabled_classes", [])
-+    if included:
-+        return class_name in included
-+    if excluded:
-+        return class_name not in excluded
-+    return True
+ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
+-    global classes
+-    files = []
++    api = {}
+     with open(api_filepath) as api_file:
+         classes = json.load(api_file)
++    return _get_file_list(classes, output_dir, headers, sources)
++
++
++def _get_file_list(api, output_dir, headers=False, sources=False):
++    global classes
++    classes = api
++    files = []
+     include_gen_folder = Path(output_dir) / "include" / "gen"
+     source_gen_folder = Path(output_dir) / "src" / "gen"
+     for _class in classes:
+@@ -58,9 +64,15 @@ def scons_generate_bindings(target, source, env):
+ 
+ 
+ def generate_bindings(api_filepath, use_template_get_node, output_dir="."):
+-    global classes
++    classes = {}
+     with open(api_filepath) as api_file:
+         classes = json.load(api_file)
++    _generate_bindings(classes, use_template_get_node, output_dir)
++
++
++def _generate_bindings(api, use_template_get_node, output_dir="."):
++    global classes
++    classes = api
+ 
+     icalls = set()
+     include_gen_folder = Path(output_dir) / "include" / "gen"
+diff --git a/godot-cpp-3.x/build_profile.py b/godot-cpp-3.x/build_profile.py
+new file mode 100644
+index 0000000..5518f64
+--- /dev/null
++++ b/godot-cpp-3.x/build_profile.py
+@@ -0,0 +1,177 @@
++import json
++import sys
 +
 +
 +def parse_build_profile(profile_filepath, api):
 +    if profile_filepath == "":
 +        return {}
-+    print("Using feature build profile: " + profile_filepath)
 +
 +    with open(profile_filepath, encoding="utf-8") as profile_file:
 +        profile = json.load(profile_file)
@@ -60,32 +131,19 @@ index da4bb61..e5bd040 100644
 +        children[parent] = children.get(parent, [])
 +        children[parent].append(child)
 +
-+    # Parse methods dependencies
-+    deps = {}
-+    reverse_deps = {}
-+    for name, engine_class in api_dict.items():
-+        ref_cls = set()
-+        for method in engine_class.get("methods", []):
-+            rtype = method.get("return_value", {}).get("type", "")
-+            args = [a["type"] for a in method.get("arguments", [])]
-+            if rtype in api_dict:
-+                ref_cls.add(rtype)
-+            for arg in args:
-+                if arg in api_dict:
-+                    ref_cls.add(arg)
-+        deps[engine_class["name"]] = set(filter(lambda x: x != name, ref_cls))
-+        for acls in ref_cls:
-+            if acls == name:
-+                continue
-+            reverse_deps[acls] = reverse_deps.get(acls, set())
-+            reverse_deps[acls].add(name)
-+
 +    included = []
 +    front = list(profile.get("enabled_classes", []))
 +    if front:
 +        # These must always be included
-+        front.append("ConfigFile")
++        front.append("WorkerThreadPool")
 +        front.append("ClassDB")
++        front.append("ClassDBSingleton")
++        # In src/classes/low_level.cpp
++        front.append("FileAccess")
++        front.append("Image")
++        front.append("XMLParser")
++        # In include/godot_cpp/templates/thread_work_pool.hpp
++        front.append("Semaphore")
 +    while front:
 +        cls = front.pop()
 +        if cls in included:
@@ -94,10 +152,6 @@ index da4bb61..e5bd040 100644
 +        parent = parents.get(cls, "")
 +        if parent:
 +            front.append(parent)
-+        for rcls in deps.get(cls, set()):
-+            if rcls in included or rcls in front:
-+                continue
-+            front.append(rcls)
 +
 +    excluded = []
 +    front = list(profile.get("disabled_classes", []))
@@ -107,10 +161,6 @@ index da4bb61..e5bd040 100644
 +            continue
 +        excluded.append(cls)
 +        front += children.get(cls, [])
-+        for rcls in reverse_deps.get(cls, set()):
-+            if rcls in excluded or rcls in front:
-+                continue
-+            front.append(rcls)
 +
 +    if included and excluded:
 +        print(
@@ -123,74 +173,114 @@ index da4bb61..e5bd040 100644
 +    }
 +
 +
- classes = []
- 
- 
--def get_file_list(api_filepath, output_dir, headers=False, sources=False):
-+def get_file_list(api_filepath, output_dir, headers=False, sources=False, profile_filepath=""):
-     global classes
++def generate_trimmed_api(source_api_filepath, profile_filepath):
++    with open(source_api_filepath, encoding="utf-8") as api_file:
++        api = json.load(api_file)
 +
-     files = []
-     with open(api_filepath) as api_file:
-         classes = json.load(api_file)
-+        build_profile = parse_build_profile(profile_filepath, classes)
++    if profile_filepath == "":
++        return api
 +
-     include_gen_folder = Path(output_dir) / "include" / "gen"
-     source_gen_folder = Path(output_dir) / "src" / "gen"
-     for _class in classes:
-@@ -27,7 +128,7 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
-         source_filename = source_gen_folder / (strip_name(_class["name"]) + ".cpp")
-         if headers:
-             files.append(str(header_filename.as_posix()))
--        if sources:
-+        if sources and is_class_included(_class["name"], build_profile):
-             files.append(str(source_filename.as_posix()))
-     icall_header_filename = include_gen_folder / "__icalls.hpp"
-     register_types_filename = source_gen_folder / "__register_types.cpp"
-@@ -40,27 +141,32 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
-     return files
- 
- 
--def print_file_list(api_filepath, output_dir, headers=False, sources=False):
--    for f in get_file_list(api_filepath, output_dir, headers, sources):
-+def print_file_list(api_filepath, output_dir, headers=False, sources=False, profile_filepath=""):
-+    for f in get_file_list(api_filepath, output_dir, headers, sources, profile_filepath):
-         print(f, end=";")
- 
- 
- def scons_emit_files(target, source, env):
--    files = [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True)]
-+    profile_filepath = env.get("build_profile", "")
-+    if profile_filepath and not Path(profile_filepath).is_absolute():
-+        profile_filepath = str((Path(env.Dir("#").abspath) / profile_filepath).as_posix())
++    build_profile = parse_build_profile(profile_filepath, api)
 +
-+    files = [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True, profile_filepath)]
-     env.Clean(target, files)
-     env["godot_cpp_gen_dir"] = target[0].abspath
-     return files, source
- 
- 
- def scons_generate_bindings(target, source, env):
--    generate_bindings(str(source[0]), env["generate_template_get_node"], env["godot_cpp_gen_dir"])
-+    generate_bindings(str(source[0]), env["generate_template_get_node"], env["godot_cpp_gen_dir"], env["build_profile"])
-     return None
- 
- 
--def generate_bindings(api_filepath, use_template_get_node, output_dir="."):
-+def generate_bindings(api_filepath, use_template_get_node, output_dir=".", profile_filepath=""):
-     global classes
-     with open(api_filepath) as api_file:
-         classes = json.load(api_file)
-+        build_profile = parse_build_profile(profile_filepath, classes)
- 
-     icalls = set()
-     include_gen_folder = Path(output_dir) / "include" / "gen"
-@@ -97,7 +203,7 @@ def generate_bindings(api_filepath, use_template_get_node, output_dir="."):
- 
-     init_method_bindings_filename = source_gen_folder / "__init_method_bindings.cpp"
-     with init_method_bindings_filename.open("w+") as init_method_bindings_file:
--        init_method_bindings_file.write(generate_init_method_bindings(classes))
-+        init_method_bindings_file.write(generate_init_method_bindings(list(filter(lambda x: is_class_included(x["name"], build_profile), classes))))
- 
- 
- def is_reference_type(t):
++    engine_classes = {}
++    for class_api in api:
++        engine_classes[class_api["name"]] = class_api["is_reference"]
++
++    classes = []
++    for class_api in api:
++        if not is_class_included(class_api["name"], build_profile):
++            continue
++        if "methods" in class_api:
++            methods = []
++            for method in class_api["methods"]:
++                if not is_method_included(method, build_profile, engine_classes):
++                    continue
++                methods.append(method)
++            class_api["methods"] = methods
++        classes.append(class_api)
++    return classes
++
++
++def is_class_included(class_name, build_profile):
++    """
++    Check if an engine class should be included.
++    This removes classes according to a build profile of enabled or disabled classes.
++    """
++    included = build_profile.get("enabled_classes", [])
++    excluded = build_profile.get("disabled_classes", [])
++    if included:
++        return class_name in included
++    if excluded:
++        return class_name not in excluded
++    return True
++
++
++def is_method_included(method, build_profile, engine_classes):
++    """
++    Check if an engine class method should be included.
++    This removes methods according to a build profile of enabled or disabled classes.
++    """
++    included = build_profile.get("enabled_classes", [])
++    excluded = build_profile.get("disabled_classes", [])
++    ref_cls = set()
++    rtype = get_base_type(method.get("return_type", ""))
++    args = [get_base_type(a["type"]) for a in method.get("arguments", [])]
++    if rtype in engine_classes:
++        ref_cls.add(rtype)
++    elif is_enum(rtype) and get_enum_class(rtype) in engine_classes:
++        ref_cls.add(get_enum_class(rtype))
++    for arg in args:
++        if arg in engine_classes:
++            ref_cls.add(arg)
++        elif is_enum(arg) and get_enum_class(arg) in engine_classes:
++            ref_cls.add(get_enum_class(arg))
++    for acls in ref_cls:
++        if len(included) > 0 and acls not in included:
++            return False
++        elif len(excluded) > 0 and acls in excluded:
++            return False
++    return True
++
++
++def is_enum(type_name):
++    return type_name.startswith("enum::") or type_name.startswith("bitfield::")
++
++
++def get_enum_class(enum_name: str):
++    if "." in enum_name:
++        if is_bitfield(enum_name):
++            return enum_name.replace("bitfield::", "").split(".")[0]
++        else:
++            return enum_name.replace("enum::", "").split(".")[0]
++    else:
++        return "GlobalConstants"
++
++
++def get_base_type(type_name):
++    if type_name.startswith("const "):
++        type_name = type_name[6:]
++    if type_name.endswith("*"):
++        type_name = type_name[:-1]
++    if type_name.startswith("typedarray::"):
++        type_name = type_name.replace("typedarray::", "")
++    return type_name
++
++
++def is_bitfield(type_name):
++    return type_name.startswith("bitfield::")
++
++
++if __name__ == "__main__":
++    if len(sys.argv) < 3 or len(sys.argv) > 4:
++        print("Usage: %s BUILD_PROFILE INPUT_JSON [OUTPUT_JSON]" % (sys.argv[0]))
++        sys.exit(1)
++    profile = sys.argv[1]
++    infile = sys.argv[2]
++    outfile = sys.argv[3] if len(sys.argv) > 3 else ""
++    api = generate_trimmed_api(infile, profile)
++
++    if outfile:
++        with open(outfile, "w", encoding="utf-8") as f:
++            json.dump(api, f)
++    else:
++        json.dump(api, sys.stdout)

misc/patches/build_profile_4.0.diff

@@ -1,180 +0,0 @@
-diff --git a/godot-cpp-4.0/SConstruct b/godot-cpp-4.0/SConstruct
-index 27ee137..ec2af72 100644
---- a/godot-cpp-4.0/SConstruct
-+++ b/godot-cpp-4.0/SConstruct
-@@ -119,6 +119,14 @@ opts.Add(
- opts.Add(
-     BoolVariable("generate_bindings", "Force GDExtension API bindings generation. Auto-detected by default.", False)
- )
-+opts.Add(
-+    PathVariable(
-+        "build_profile",
-+        "Path to a file containing a feature build profile",
-+        default=env.get("build_profile", None),
-+        validator=lambda key, val, env: os.path.isfile(normalize_path(val)),
-+    )
-+)
- opts.Add(BoolVariable("generate_template_get_node", "Generate a template version of the Node class's get_node.", True))
- 
- opts.Add(BoolVariable("build_library", "Build the godot-cpp library.", True))
-diff --git a/godot-cpp-4.0/binding_generator.py b/godot-cpp-4.0/binding_generator.py
-index 7634942..7ab51a5 100644
---- a/godot-cpp-4.0/binding_generator.py
-+++ b/godot-cpp-4.0/binding_generator.py
-@@ -70,12 +70,14 @@ def generate_wrappers(target):
-         f.write(txt)
- 
- 
--def get_file_list(api_filepath, output_dir, headers=False, sources=False):
-+def get_file_list(api_filepath, output_dir, headers=False, sources=False, profile_filepath=""):
-     api = {}
-     files = []
-     with open(api_filepath) as api_file:
-         api = json.load(api_file)
- 
-+    build_profile = parse_build_profile(profile_filepath, api)
-+
-     core_gen_folder = Path(output_dir) / "gen" / "include" / "godot_cpp" / "core"
-     include_gen_folder = Path(output_dir) / "gen" / "include" / "godot_cpp"
-     source_gen_folder = Path(output_dir) / "gen" / "src"
-@@ -104,7 +106,7 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
-         source_filename = source_gen_folder / "classes" / (camel_to_snake(engine_class["name"]) + ".cpp")
-         if headers:
-             files.append(str(header_filename.as_posix()))
--        if sources:
-+        if sources and is_class_included(engine_class["name"], build_profile):
-             files.append(str(source_filename.as_posix()))
- 
-     for native_struct in api["native_structures"]:
-@@ -132,14 +134,107 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
-     return files
- 
- 
--def print_file_list(api_filepath, output_dir, headers=False, sources=False):
-+def print_file_list(api_filepath, output_dir, headers=False, sources=False, profile_filepath=""):
-     end = ";"
--    for f in get_file_list(api_filepath, output_dir, headers, sources):
-+    for f in get_file_list(api_filepath, output_dir, headers, sources, profile_filepath):
-         print(f, end=end)
- 
- 
-+def parse_build_profile(profile_filepath, api):
-+    if profile_filepath == "":
-+        return {}
-+    print("Using feature build profile: " + profile_filepath)
-+
-+    with open(profile_filepath, encoding="utf-8") as profile_file:
-+        profile = json.load(profile_file)
-+
-+    api_dict = {}
-+    parents = {}
-+    children = {}
-+    for engine_class in api["classes"]:
-+        api_dict[engine_class["name"]] = engine_class
-+        parent = engine_class.get("inherits", "")
-+        child = engine_class["name"]
-+        parents[child] = parent
-+        if parent == "":
-+            continue
-+        children[parent] = children.get(parent, [])
-+        children[parent].append(child)
-+
-+    # Parse methods dependencies
-+    deps = {}
-+    reverse_deps = {}
-+    for name, engine_class in api_dict.items():
-+        ref_cls = set()
-+        for method in engine_class.get("methods", []):
-+            rtype = method.get("return_value", {}).get("type", "")
-+            args = [a["type"] for a in method.get("arguments", [])]
-+            if rtype in api_dict:
-+                ref_cls.add(rtype)
-+            elif is_enum(rtype) and get_enum_class(rtype) in api_dict:
-+                ref_cls.add(get_enum_class(rtype))
-+            for arg in args:
-+                if arg in api_dict:
-+                    ref_cls.add(arg)
-+                elif is_enum(arg) and get_enum_class(arg) in api_dict:
-+                    ref_cls.add(get_enum_class(arg))
-+        deps[engine_class["name"]] = set(filter(lambda x: x != name, ref_cls))
-+        for acls in ref_cls:
-+            if acls == name:
-+                continue
-+            reverse_deps[acls] = reverse_deps.get(acls, set())
-+            reverse_deps[acls].add(name)
-+
-+    included = []
-+    front = list(profile.get("enabled_classes", []))
-+    if front:
-+        # These must always be included
-+        front.append("WorkerThreadPool")
-+        front.append("ClassDB")
-+        front.append("ClassDBSingleton")
-+    while front:
-+        cls = front.pop()
-+        if cls in included:
-+            continue
-+        included.append(cls)
-+        parent = parents.get(cls, "")
-+        if parent:
-+            front.append(parent)
-+        for rcls in deps.get(cls, set()):
-+            if rcls in included or rcls in front:
-+                continue
-+            front.append(rcls)
-+
-+    excluded = []
-+    front = list(profile.get("disabled_classes", []))
-+    while front:
-+        cls = front.pop()
-+        if cls in excluded:
-+            continue
-+        excluded.append(cls)
-+        front += children.get(cls, [])
-+        for rcls in reverse_deps.get(cls, set()):
-+            if rcls in excluded or rcls in front:
-+                continue
-+            front.append(rcls)
-+
-+    if included and excluded:
-+        print(
-+            "WARNING: Cannot specify both 'enabled_classes' and 'disabled_classes' in build profile. 'disabled_classes' will be ignored."
-+        )
-+
-+    return {
-+        "enabled_classes": included,
-+        "disabled_classes": excluded,
-+    }
-+
-+
- def scons_emit_files(target, source, env):
--    files = [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True)]
-+    profile_filepath = env.get("build_profile", "")
-+    if profile_filepath and not Path(profile_filepath).is_absolute():
-+        profile_filepath = str((Path(env.Dir("#").abspath) / profile_filepath).as_posix())
-+
-+    files = [env.File(f) for f in get_file_list(str(source[0]), target[0].abspath, True, True, profile_filepath)]
-     env.Clean(target, files)
-     env["godot_cpp_gen_dir"] = target[0].abspath
-     return files, source
-@@ -1997,6 +2092,20 @@ def is_pod_type(type_name):
-     ]
- 
- 
-+def is_class_included(class_name, build_profile):
-+    """
-+    Check if an engine class should be included.
-+    This removes classes according to a build profile of enabled or disabled classes.
-+    """
-+    included = build_profile.get("enabled_classes", [])
-+    excluded = build_profile.get("disabled_classes", [])
-+    if included:
-+        return class_name in included
-+    if excluded:
-+        return class_name not in excluded
-+    return True
-+
-+
- def is_included_type(type_name):
-     # Types which we already have implemented.
-     return is_included_struct_type(type_name) or type_name in ["ObjectID"]

misc/patches/scons_path.diff

@@ -1,17 +1,3 @@
-diff --git a/godot-cpp-4.0/SConstruct b/godot-cpp-4.0/SConstruct
-index 27ee137..32b425e 100644
---- a/godot-cpp-4.0/SConstruct
-+++ b/godot-cpp-4.0/SConstruct
-@@ -54,6 +54,8 @@ else:
- # Default tools with no platform defaults to gnu toolchain.
- # We apply platform specific toolchains via our custom tools.
- env = Environment(tools=["default"], PLATFORM="")
-+# Allows us to use Godot buildroot toolchain
-+env.PrependENVPath("PATH", os.getenv("PATH"))
-
- # Default num_jobs to local cpu count if not user specified.
- # SCons has a peculiarity where user-specified options won't be overridden
-
 diff --git a/godot-cpp-3.x/SConstruct b/godot-cpp-3.x/SConstruct
 index f653d54..6f40377 100644
 --- a/godot-cpp-3.x/SConstruct

misc/webrtc.gdextension

@@ -1,7 +1,7 @@
 [configuration]
 
 entry_symbol = "webrtc_extension_init"
-compatibility_minimum = {GODOT_VERSION}
+compatibility_minimum = 4.1
 
 [libraries]
 

src/WebRTCLibPeerConnection.cpp

@@ -199,7 +199,7 @@ Error WebRTCLibPeerConnection::_initialize(const Dictionary &p_config) {
 	return _create_pc(config);
 }
 
-#if defined(GDNATIVE_WEBRTC) || defined(GDEXTENSION_WEBRTC_40)
+#if defined(GDNATIVE_WEBRTC)
 Object *WebRTCLibPeerConnection::_create_data_channel(const String &p_channel, const Dictionary &p_channel_config) try {
 #else
 Ref<WebRTCDataChannel> WebRTCLibPeerConnection::_create_data_channel(const String &p_channel, const Dictionary &p_channel_config) try {

src/WebRTCLibPeerConnection.hpp

@@ -83,7 +83,7 @@ public:
 	SignalingState _get_signaling_state() const override;
 
 	godot::Error _initialize(const godot::Dictionary &p_config) override;
-#if defined(GDNATIVE_WEBRTC) || defined(GDEXTENSION_WEBRTC_40)
+#if defined(GDNATIVE_WEBRTC)
 	godot::Object *_create_data_channel(const godot::String &p_channel, const godot::Dictionary &p_channel_config) override;
 #else
 	godot::Ref<godot::WebRTCDataChannel> _create_data_channel(const godot::String &p_channel, const godot::Dictionary &p_channel_config) override;

src/init_gdextension.cpp

@@ -66,11 +66,7 @@ void unregister_webrtc_extension_types(ModuleInitializationLevel p_level) {
 }
 
 extern "C" {
-#ifdef GDEXTENSION_WEBRTC_40
-GDExtensionBool GDE_EXPORT webrtc_extension_init(const GDExtensionInterface *p_interface, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
-#else
 GDExtensionBool GDE_EXPORT webrtc_extension_init(const GDExtensionInterfaceGetProcAddress p_interface, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
-#endif
 	GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization);
 
 	init_obj.register_initializer(register_webrtc_extension_types);

thirdparty/README.md

@@ -19,7 +19,7 @@ Module location:
 ## libdatachannel
 
 - Upstream: https://github.com/paullouisageneau/libdatachannel
-- Version: 0.22.2 (3c33ea0f49fff2630be080b2043052b4d3de5786, 2024)
+- Version: 0.22.3 (d74748fd46f75cee5090d187841c6921820eb9d0, 2024)
 - License: MPL 2.0
 
 Module location:

tools/cmake.py

@@ -5,6 +5,11 @@ import SCons.Builder
 import SCons.Action
 
 
+# This must be kept in sync with the value in https://github.com/godotengine/godot/blob/master/platform/android/detect.py#L58.
+def get_ndk_version():
+    return "23.2.8568313"
+
+
 def cmake_default_flags(env):
     if env.get("cmake_default_flags", ""):
         return SCons.Util.CLVar(env["cmake_default_flags"])
@@ -28,9 +33,8 @@ def cmake_default_flags(env):
         config["CMAKE_SYSTEM_VERSION"] = api
         config["CMAKE_ANDROID_ARCH_ABI"] = abi
         config["ANDROID_ABI"] = abi
-        config["CMAKE_TOOLCHAIN_FILE"] = "%s/build/cmake/android.toolchain.cmake" % env.get(
-            "ANDROID_NDK_ROOT", os.environ.get("ANDROID_NDK_ROOT", "")
-        )
+        ndk_root = os.environ.get("ANDROID_NDK_ROOT", env.get("ANDROID_HOME", "") + "/ndk/" + get_ndk_version())
+        config["CMAKE_TOOLCHAIN_FILE"] = "%s/build/cmake/android.toolchain.cmake" % ndk_root
         config["CMAKE_ANDROID_STL_TYPE"] = "c++_static"
 
     elif env["platform"] == "linux":

tools/openssl.py

@@ -6,6 +6,11 @@ from SCons.Defaults import Mkdir
 from SCons.Variables import PathVariable, BoolVariable
 
 
+# This must be kept in sync with the value in https://github.com/godotengine/godot/blob/master/platform/android/detect.py#L58.
+def get_ndk_version():
+    return "23.2.8568313"
+
+
 def ssl_platform_target(env):
     targets = {}
     platform = env["platform"]
@@ -264,7 +269,8 @@ def generate(env):
         if cc_path and cc_path not in env["ENV"]:
             env.PrependENVPath("PATH", cc_path)
         if "ANDROID_NDK_ROOT" not in env["ENV"]:
-            env["ENV"]["ANDROID_NDK_ROOT"] = env.get("ANDROID_NDK_ROOT", os.environ.get("ANDROID_NDK_ROOT", ""))
+            ndk_root = os.environ.get("ANDROID_NDK_ROOT", env.get("ANDROID_HOME", "") + "/ndk/" + get_ndk_version())
+            env["ENV"]["ANDROID_NDK_ROOT"] = ndk_root
 
     env["SSL_SOURCE"] = env.Dir(env["openssl_source"]).abspath
     env["SSL_BUILD"] = env.Dir(env["openssl_build"] + "/{}/{}".format(env["platform"], env["arch"])).abspath