Skip to content

Commit 046c3d2

Browse files
committed
better
1 parent c1b144f commit 046c3d2

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
@@ -468,17 +468,17 @@ bool ShouldIgnoreSplitConfigs ()
468468

469469
void GetRequiredTokens (string assemblyFilePath, out int android_runtime_jnienv_class_token, out int jnienv_initialize_method_token, out int jnienv_registerjninatives_method_token)
470470
{
471-
if (File.Exists (assemblyFilePath)) {
472-
using var pe = new PEReader (File.OpenRead (assemblyFilePath));
473-
GetRequiredTokens (pe.GetMetadataReader (), out android_runtime_jnienv_class_token, out jnienv_initialize_method_token, out jnienv_registerjninatives_method_token);
474-
} else {
471+
if (!File.Exists (assemblyFilePath)) {
475472
android_runtime_jnienv_class_token = -1;
476473
jnienv_initialize_method_token = -1;
477474
jnienv_registerjninatives_method_token = -1;
478475
Log.LogDebugMessage ($"Assembly '{assemblyFilePath}' does not exist, unable to read required tokens from it");
479476
return;
480477
}
481478

479+
using var pe = new PEReader (File.OpenRead (assemblyFilePath));
480+
GetRequiredTokens (pe.GetMetadataReader (), out android_runtime_jnienv_class_token, out jnienv_initialize_method_token, out jnienv_registerjninatives_method_token);
481+
482482
if (android_runtime_jnienv_class_token == -1 || jnienv_initialize_method_token == -1 || jnienv_registerjninatives_method_token == -1) {
483483
throw new InvalidOperationException ($"Unable to find the required Android.Runtime.JNIEnvInit method tokens for {assemblyFilePath}");
484484
}

0 commit comments

Comments
 (0)