From 3df67c640a0f4c03695ff4c3695bb9250a8c9bef Mon Sep 17 00:00:00 2001
From: morluto <76467478+morluto@users.noreply.github.com>
Date: Sun, 11 Oct 2026 09:29:54 +0800
Subject: [PATCH] fix(ghidra): isolate optional nativeaot script sources

---
 .../{ghidra/extensions => }/nativeaot/NativeAotDirectory.java   | 0
 .../{ghidra/extensions => }/nativeaot/NativeAotExtension.java   | 0
 .../extensions => }/nativeaot/NativeAotMethodConventions.java   | 0
 .../extensions => }/nativeaot/NativeAotTypeMetadata.java        | 0
 scripts/build-ghidra-nativeaot.mjs                              | 2 +-
 scripts/ci/scopes.mjs                                           | 2 +-
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename bridge/{ghidra/extensions => }/nativeaot/NativeAotDirectory.java (100%)
 rename bridge/{ghidra/extensions => }/nativeaot/NativeAotExtension.java (100%)
 rename bridge/{ghidra/extensions => }/nativeaot/NativeAotMethodConventions.java (100%)
 rename bridge/{ghidra/extensions => }/nativeaot/NativeAotTypeMetadata.java (100%)

diff --git a/bridge/ghidra/extensions/nativeaot/NativeAotDirectory.java b/bridge/nativeaot/NativeAotDirectory.java
similarity index 100%
rename from bridge/ghidra/extensions/nativeaot/NativeAotDirectory.java
rename to bridge/nativeaot/NativeAotDirectory.java
diff --git a/bridge/ghidra/extensions/nativeaot/NativeAotExtension.java b/bridge/nativeaot/NativeAotExtension.java
similarity index 100%
rename from bridge/ghidra/extensions/nativeaot/NativeAotExtension.java
rename to bridge/nativeaot/NativeAotExtension.java
diff --git a/bridge/ghidra/extensions/nativeaot/NativeAotMethodConventions.java b/bridge/nativeaot/NativeAotMethodConventions.java
similarity index 100%
rename from bridge/ghidra/extensions/nativeaot/NativeAotMethodConventions.java
rename to bridge/nativeaot/NativeAotMethodConventions.java
diff --git a/bridge/ghidra/extensions/nativeaot/NativeAotTypeMetadata.java b/bridge/nativeaot/NativeAotTypeMetadata.java
similarity index 100%
rename from bridge/ghidra/extensions/nativeaot/NativeAotTypeMetadata.java
rename to bridge/nativeaot/NativeAotTypeMetadata.java
diff --git a/scripts/build-ghidra-nativeaot.mjs b/scripts/build-ghidra-nativeaot.mjs
index f787c8c72d..5d06dd60a2 100644
--- a/scripts/build-ghidra-nativeaot.mjs
+++ b/scripts/build-ghidra-nativeaot.mjs
@@ -78,7 +78,7 @@ const classes = await mkdtemp(join(output, "classes-"));
 try {
   const sources = [
     ...(await files(join(source, "src/main/java"), ".java")),
-    ...(await files(join(root, "bridge/ghidra/extensions/nativeaot"), ".java")),
+    ...(await files(join(root, "bridge/nativeaot"), ".java")),
   ];
   const jars = await files(join(install, "Ghidra"), ".jar");
   const args = [
diff --git a/scripts/ci/scopes.mjs b/scripts/ci/scopes.mjs
index eac78049b0..f380c19ee8 100644
--- a/scripts/ci/scopes.mjs
+++ b/scripts/ci/scopes.mjs
@@ -214,7 +214,7 @@ export const SCOPES = {
     "src/artifacts/readStableArtifact.ts",
   ],
   nativeaot: [
-    "bridge/ghidra/extensions/nativeaot/**",
+    "bridge/nativeaot/**",
     "scripts/generate-nativeaot-fixtures.mjs",
     "tests/fixtures/nativeaot/**",
     ".github/workflows/nativeaot-fixtures.yml",