Skip to content

Commit 3ea3e3b

Browse files
committed
better
1 parent ff832d1 commit 3ea3e3b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -443,17 +443,17 @@ bool ShouldIgnoreSplitConfigs ()
443443

444444
void GetRequiredTokens (string assemblyFilePath, out int android_runtime_jnienv_class_token, out int jnienv_initialize_method_token, out int jnienv_registerjninatives_method_token)
445445
{
446-
if (File.Exists (assemblyFilePath)) {
447-
using var pe = new PEReader (File.OpenRead (assemblyFilePath));
448-
GetRequiredTokens (pe.GetMetadataReader (), out android_runtime_jnienv_class_token, out jnienv_initialize_method_token, out jnienv_registerjninatives_method_token);
449-
} else {
446+
if (!File.Exists (assemblyFilePath)) {
450447
android_runtime_jnienv_class_token = -1;
451448
jnienv_initialize_method_token = -1;
452449
jnienv_registerjninatives_method_token = -1;
453450
Log.LogDebugMessage ($"Assembly '{assemblyFilePath}' does not exist, unable to read required tokens from it");
454451
return;
455452
}
456453

454+
using var pe = new PEReader (File.OpenRead (assemblyFilePath));
455+
GetRequiredTokens (pe.GetMetadataReader (), out android_runtime_jnienv_class_token, out jnienv_initialize_method_token, out jnienv_registerjninatives_method_token);
456+
457457
if (android_runtime_jnienv_class_token == -1 || jnienv_initialize_method_token == -1 || jnienv_registerjninatives_method_token == -1) {
458458
throw new InvalidOperationException ($"Unable to find the required Android.Runtime.JNIEnvInit method tokens for {assemblyFilePath}");
459459
}

0 commit comments

Comments
 (0)