Take array of triplet + path when creating Android prebuilds

Author: kraenhansen

packages/cmake-rn/src/platforms/android.ts

@@ -122,7 +122,10 @@ export const platform: Platform<Triplet[], AndroidOpts> = {
     return typeof ANDROID_HOME === "string" && fs.existsSync(ANDROID_HOME);
   },
   async postBuild({ outputPath, triplets }, { autoLink, configuration }) {
-    const prebuilds: Record<string, Partial<Record<Triplet, string>>> = {};
+    const prebuilds: Record<
+      string,
+      { triplet: Triplet; libraryPath: string }[]
+    > = {};
 
     for (const { triplet, buildPath } of triplets) {
       assert(fs.existsSync(buildPath), `Expected a directory at ${buildPath}`);
@@ -148,25 +151,23 @@ export const platform: Platform<Triplet[], AndroidOpts> = {
       const [artifact] = artifacts;
       // Add prebuild entry, creating a new entry if needed
       if (!(sharedLibrary.name in prebuilds)) {
-        prebuilds[sharedLibrary.name] = {};
+        prebuilds[sharedLibrary.name] = [];
       }
-      prebuilds[sharedLibrary.name][triplet] = path.join(
-        buildPath,
-        artifact.path,
-      );
+      prebuilds[sharedLibrary.name].push({
+        triplet,
+        libraryPath: path.join(buildPath, artifact.path),
+      });
     }
 
-    for (const [libraryName, libraryPathByTriplet] of Object.entries(
-      prebuilds,
-    )) {
+    for (const [libraryName, libraries] of Object.entries(prebuilds)) {
       const prebuildOutputPath = path.resolve(
         outputPath,
         `${libraryName}.android.node`,
       );
       await oraPromise(
         createAndroidLibsDirectory({
           outputPath: prebuildOutputPath,
-          libraryPathByTriplet,
+          libraries,
           autoLink,
         }),
         {

packages/ferric/src/build.ts

@@ -204,15 +204,13 @@ export const buildCommand = new Command("build")
         );
 
         if (androidLibraries.length > 0) {
-          const libraryPathByTriplet = Object.fromEntries(
-            androidLibraries.map(([target, outputPath]) => [
-              ANDROID_TRIPLET_PER_TARGET[target],
-              outputPath,
-            ]),
-          ) as Record<AndroidTriplet, string>;
+          const libraries = androidLibraries.map(([target, outputPath]) => ({
+            triplet: ANDROID_TRIPLET_PER_TARGET[target],
+            libraryPath: outputPath,
+          }));
 
           const androidLibsFilename = determineAndroidLibsFilename(
-            Object.values(libraryPathByTriplet),
+            libraries.map(({ libraryPath }) => libraryPath),
           );
           const androidLibsOutputPath = path.resolve(
             outputPath,
@@ -222,7 +220,7 @@ export const buildCommand = new Command("build")
           await oraPromise(
             createAndroidLibsDirectory({
               outputPath: androidLibsOutputPath,
-              libraryPathByTriplet,
+              libraries,
               autoLink: true,
             }),
             {

packages/host/src/node/prebuilds/android.ts

@@ -32,24 +32,24 @@ export function determineAndroidLibsFilename(libraryPaths: string[]) {
 
 type AndroidLibsDirectoryOptions = {
   outputPath: string;
-  libraryPathByTriplet: Partial<Record<AndroidTriplet, string>>;
+  libraries: { triplet: AndroidTriplet; libraryPath: string }[];
   autoLink: boolean;
 };
 
 export async function createAndroidLibsDirectory({
   outputPath,
-  libraryPathByTriplet,
+  libraries,
   autoLink,
 }: AndroidLibsDirectoryOptions) {
   // Delete and recreate any existing output directory
   await fs.promises.rm(outputPath, { recursive: true, force: true });
   await fs.promises.mkdir(outputPath, { recursive: true });
-  for (const [triplet, libraryPath] of Object.entries(libraryPathByTriplet)) {
+  for (const { triplet, libraryPath } of libraries) {
     assert(
       fs.existsSync(libraryPath),
       `Library not found: ${libraryPath} for triplet ${triplet}`,
     );
-    const arch = ANDROID_ARCHITECTURES[triplet as AndroidTriplet];
+    const arch = ANDROID_ARCHITECTURES[triplet];
     const archOutputPath = path.join(outputPath, arch);
     await fs.promises.mkdir(archOutputPath, { recursive: true });
     // Strip the ".node" extension from the library name