BundleToolNoAbiSplitTests should work now

Author: grendello

src/native/clr/host/host.cc

@@ -264,6 +264,7 @@ void Host::gather_assemblies_and_libraries (jstring_array_wrapper& runtimeApks,
 
 	int64_t apk_count = static_cast<int64_t>(runtimeApks.get_length ());
 	bool got_split_config_abi_apk = false;
+	std::string_view base_apk{};
 
 	for (int64_t i = 0; i < apk_count; i++) {
 		std::string_view apk_file = runtimeApks [static_cast<size_t>(i)].get_string_view ();
@@ -272,9 +273,11 @@ void Host::gather_assemblies_and_libraries (jstring_array_wrapper& runtimeApks,
 			bool scan_apk = false;
 
 			// With split configs we need to scan only the abi apk, because both the assembly stores and the runtime
-			// configuration blob are in `lib/{ARCH}`, which in turn lives in the split config APK
+			// configuration blob **should be** in `lib/{ARCH}`, which in turn lives in the split config APK
 			if (!got_split_config_abi_apk && apk_file.ends_with (Constants::split_config_abi_apk_name.data ())) {
 				got_split_config_abi_apk = scan_apk = true;
+			} else if (base_apk.empty () && apk_file.ends_with (Constants::base_apk_name)) {
+				base_apk = apk_file;
 			}
 
 			if (!scan_apk) {
@@ -284,6 +287,14 @@ void Host::gather_assemblies_and_libraries (jstring_array_wrapper& runtimeApks,
 
 		Zip::scan_archive (apk_file, zip_scan_callback);
 	}
+
+	// This apparently can happen now... It seems that sometimes (when and why? No idea) when AAB format is used, bundletool
+	// won't put the native libraries in a separate split config file, but it will instead put **all** of the ABIs
+	// in base.apk
+	if (have_split_apks && !got_split_config_abi_apk) {
+		abort_unless (!base_apk.empty (), "Split config APKs are used, but no ABI config was found and no base.apk was encountered.");
+		Zip::scan_archive (base_apk, zip_scan_callback);
+	}
 }
 
 [[gnu::always_inline]]

src/native/clr/include/constants.hh

@@ -112,6 +112,7 @@ namespace xamarin::android {
 		static constexpr std::string_view assembly_store_file_name { assembly_store_file_name_array.data () };
 
 		static constexpr auto split_config_abi_apk_name = concat_string_views<split_config_abi_apk_name_size> (split_config_prefix, android_abi, split_config_extension);
+		static constexpr std::string_view base_apk_name = { "/base.apk" };
 
 		//
 		// Indexes must match these of trhe `appDirs` array in src/java-runtime/mono/android/MonoPackageManager.java

src/native/clr/runtime-base/android-system.cc

@@ -172,6 +172,7 @@ AndroidSystem::setup_apk_directories (unsigned short running_on_cpu, jstring_arr
 	std::string_view const& abi = android_abi_names [running_on_cpu];
 	size_t number_of_added_directories = 0uz;
 
+	std::string_view base_apk{};
 	for (size_t i = 0uz; i < runtimeApks.get_length (); ++i) {
 		jstring_wrapper &e = runtimeApks [i];
 		std::string_view apk = e.get_string_view ();
@@ -180,12 +181,22 @@ AndroidSystem::setup_apk_directories (unsigned short running_on_cpu, jstring_arr
 			if (apk.ends_with (Constants::split_config_abi_apk_name.data ())) {
 				add_apk_libdir (apk, number_of_added_directories, abi);
 				break;
+			} else if (base_apk.empty () && apk.ends_with (Constants::base_apk_name)) {
+				base_apk = apk;
 			}
 		} else {
 			add_apk_libdir (apk, number_of_added_directories, abi);
 		}
 	}
 
+	// This apparently can happen now... It seems that sometimes (when and why? No idea) when AAB format is used, bundletool
+	// won't put the native libraries in a separate split config file, but it will instead put **all** of the ABIs
+	// in base.apk
+	if (have_split_apks && number_of_added_directories == 0 && !base_apk.empty ()) {
+		add_apk_libdir (base_apk, number_of_added_directories, abi);
+	}
+
+	log_debug (LOG_DEFAULT, "Number of added dirs: {}", number_of_added_directories);
 	if (app_lib_directories.size () == number_of_added_directories) [[likely]] {
 		return;
 	}

src/native/mono/monodroid/monodroid-glue.cc

@@ -259,8 +259,8 @@ MonodroidRuntime::gather_bundled_assemblies (jstring_array_wrapper &runtimeApks,
 			// configuration blob are in `lib/{ARCH}`, which in turn lives in the split config APK
 			if (!got_split_config_abi_apk && Util::ends_with (apk_file.get_cstr (), SharedConstants::split_config_abi_apk_name)) {
 				got_split_config_abi_apk = scan_apk = true;
-			} else if (!application_config.have_assembly_store && !got_base_apk && Util::ends_with (apk_file.get_cstr (), base_apk_name)) {
-				got_base_apk = scan_apk = true;
+			} else if (!got_base_apk && Util::ends_with (apk_file.get_cstr (), base_apk_name)) {
+				scan_apk = got_base_apk = true;
 			}
 
 			if (!scan_apk) {