Skip to content

Commit 3f4beb7

Browse files
grendellogrendello
committed
Remove unnecessary app config field
1 parent 0b92c73 commit 3f4beb7

File tree

6 files changed

+21
-33
lines changed

6 files changed

+21
-33
lines changed

‎src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ public override bool RunTask ()
312312
PackageNamingPolicy = pnp,
313313
BoundExceptionType = boundExceptionType,
314314
JniAddNativeMethodRegistrationAttributePresent = NativeCodeGenState.TemplateJniAddNativeMethodRegistrationAttributePresent,
315-
HaveRuntimeConfigBlob = haveRuntimeConfigBlob,
316315
NumberOfAssembliesInApk = assemblyCount,
317316
BundledAssemblyNameWidth = assemblyNameWidth,
318317
MonoComponents = (MonoComponent)monoComponents,

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public sealed class ApplicationConfig
4545
public bool uses_assembly_preload;
4646
public bool broken_exception_transitions;
4747
public bool jni_add_native_method_registration_attribute_present;
48-
public bool have_runtime_config_blob;
4948
public bool have_assemblies_blob;
5049
public bool marshal_methods_enabled;
5150
public bool ignore_split_configs;
@@ -68,7 +67,7 @@ public sealed class ApplicationConfig
6867
public bool managed_marshal_methods_lookup_enabled;
6968
}
7069

71-
const uint ApplicationConfigFieldCount = 27;
70+
const uint ApplicationConfigFieldCount = 26;
7271

7372
const string ApplicationConfigSymbolName = "application_config";
7473
const string AppEnvironmentVariablesSymbolName = "app_environment_variables";
@@ -237,107 +236,102 @@ static ApplicationConfig ReadApplicationConfig (EnvironmentFile envFile)
237236
ret.jni_add_native_method_registration_attribute_present = ConvertFieldToBool ("jni_add_native_method_registration_attribute_present", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
238237
break;
239238

240-
case 6: // have_runtime_config_blob: bool / .byte
241-
AssertFieldType (envFile.Path, parser.SourceFilePath, ".byte", field [0], item.LineNumber);
242-
ret.have_runtime_config_blob = ConvertFieldToBool ("have_runtime_config_blob", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
243-
break;
244-
245-
case 7: // have_assemblies_blob: bool / .byte
239+
case 6: // have_assemblies_blob: bool / .byte
246240
AssertFieldType (envFile.Path, parser.SourceFilePath, ".byte", field [0], item.LineNumber);
247241
ret.have_assemblies_blob = ConvertFieldToBool ("have_assemblies_blob", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
248242
break;
249243

250-
case 8: // marshal_methods_enabled: bool / .byte
244+
case 7: // marshal_methods_enabled: bool / .byte
251245
AssertFieldType (envFile.Path, parser.SourceFilePath, ".byte", field [0], item.LineNumber);
252246
ret.marshal_methods_enabled = ConvertFieldToBool ("marshal_methods_enabled", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
253247
break;
254248

255-
case 9: // ignore_split_configs: bool / .byte
249+
case 8: // ignore_split_configs: bool / .byte
256250
AssertFieldType (envFile.Path, parser.SourceFilePath, ".byte", field [0], item.LineNumber);
257251
ret.ignore_split_configs = ConvertFieldToBool ("ignore_split_configs", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
258252
break;
259253

260-
case 10: // bound_stream_io_exception_type: byte / .byte
254+
case 9: // bound_stream_io_exception_type: byte / .byte
261255
AssertFieldType (envFile.Path, parser.SourceFilePath, ".byte", field [0], item.LineNumber);
262256
ret.bound_stream_io_exception_type = ConvertFieldToByte ("bound_stream_io_exception_type", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
263257
break;
264258

265-
case 11: // package_naming_policy: uint32_t / .word | .long
259+
case 10: // package_naming_policy: uint32_t / .word | .long
266260
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
267261
ret.package_naming_policy = ConvertFieldToUInt32 ("package_naming_policy", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
268262
break;
269263

270-
case 12: // environment_variable_count: uint32_t / .word | .long
264+
case 11: // environment_variable_count: uint32_t / .word | .long
271265
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
272266
ret.environment_variable_count = ConvertFieldToUInt32 ("environment_variable_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
273267
break;
274268

275-
case 13: // system_property_count: uint32_t / .word | .long
269+
case 12: // system_property_count: uint32_t / .word | .long
276270
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
277271
ret.system_property_count = ConvertFieldToUInt32 ("system_property_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
278272
break;
279273

280-
case 14: // number_of_assemblies_in_apk: uint32_t / .word | .long
274+
case 13: // number_of_assemblies_in_apk: uint32_t / .word | .long
281275
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
282276
ret.number_of_assemblies_in_apk = ConvertFieldToUInt32 ("number_of_assemblies_in_apk", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
283277
break;
284278

285-
case 15: // bundled_assembly_name_width: uint32_t / .word | .long
279+
case 14: // bundled_assembly_name_width: uint32_t / .word | .long
286280
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
287281
ret.bundled_assembly_name_width = ConvertFieldToUInt32 ("bundled_assembly_name_width", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
288282
break;
289283

290-
case 16: // number_of_assembly_store_files: uint32_t / .word | .long
284+
case 15: // number_of_assembly_store_files: uint32_t / .word | .long
291285
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
292286
ret.number_of_assembly_store_files = ConvertFieldToUInt32 ("number_of_assembly_store_files", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
293287
break;
294288

295-
case 17: // number_of_dso_cache_entries: uint32_t / .word | .long
289+
case 16: // number_of_dso_cache_entries: uint32_t / .word | .long
296290
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
297291
ret.number_of_dso_cache_entries = ConvertFieldToUInt32 ("number_of_dso_cache_entries", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
298292
break;
299293

300-
case 18: // number_of_aot_cache_entries: uint32_t / .word | .long
294+
case 17: // number_of_aot_cache_entries: uint32_t / .word | .long
301295
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
302296
ret.number_of_aot_cache_entries = ConvertFieldToUInt32 ("number_of_aot_cache_entries", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
303297
break;
304298

305-
case 19: // android_runtime_jnienv_class_token: uint32_t / .word | .long
299+
case 18: // android_runtime_jnienv_class_token: uint32_t / .word | .long
306300
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
307301
ret.android_runtime_jnienv_class_token = ConvertFieldToUInt32 ("android_runtime_jnienv_class_token", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
308302
break;
309303

310-
case 20: // jnienv_initialize_method_token: uint32_t / .word | .long
304+
case 19: // jnienv_initialize_method_token: uint32_t / .word | .long
311305
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
312306
ret.jnienv_initialize_method_token = ConvertFieldToUInt32 ("jnienv_initialize_method_token", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
313307
break;
314308

315-
case 21: // jnienv_registerjninatives_method_token: uint32_t / .word | .long
309+
case 20: // jnienv_registerjninatives_method_token: uint32_t / .word | .long
316310
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
317311
ret.jnienv_registerjninatives_method_token = ConvertFieldToUInt32 ("jnienv_registerjninatives_method_token", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
318312
break;
319313

320-
case 22: // jni_remapping_replacement_type_count: uint32_t / .word | .long
314+
case 21: // jni_remapping_replacement_type_count: uint32_t / .word | .long
321315
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
322316
ret.jni_remapping_replacement_type_count = ConvertFieldToUInt32 ("jni_remapping_replacement_type_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
323317
break;
324318

325-
case 23: // jni_remapping_replacement_method_index_entry_count: uint32_t / .word | .long
319+
case 22: // jni_remapping_replacement_method_index_entry_count: uint32_t / .word | .long
326320
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
327321
ret.jni_remapping_replacement_method_index_entry_count = ConvertFieldToUInt32 ("jni_remapping_replacement_method_index_entry_count", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
328322
break;
329323

330-
case 24: // mono_components_mask: uint32_t / .word | .long
324+
case 23: // mono_components_mask: uint32_t / .word | .long
331325
Assert.IsTrue (expectedUInt32Types.Contains (field [0]), $"Unexpected uint32_t field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
332326
ret.mono_components_mask = ConvertFieldToUInt32 ("mono_components_mask", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
333327
break;
334328

335-
case 25: // android_package_name: string / [pointer type]
329+
case 24: // android_package_name: string / [pointer type]
336330
Assert.IsTrue (expectedPointerTypes.Contains (field [0]), $"Unexpected pointer field type in '{envFile.Path}:{item.LineNumber}': {field [0]}");
337331
pointers.Add (field [1].Trim ());
338332
break;
339333

340-
case 26: // managed_marshal_methods_lookup_enabled: bool / .byte
334+
case 25: // managed_marshal_methods_lookup_enabled: bool / .byte
341335
AssertFieldType (envFile.Path, parser.SourceFilePath, ".byte", field [0], item.LineNumber);
342336
ret.managed_marshal_methods_lookup_enabled = ConvertFieldToBool ("managed_marshal_methods_lookup_enabled", envFile.Path, parser.SourceFilePath, item.LineNumber, field [1]);
343337
break;

‎src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfig.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ sealed class ApplicationConfig
3030
public bool uses_assembly_preload;
3131
public bool broken_exception_transitions;
3232
public bool jni_add_native_method_registration_attribute_present;
33-
public bool have_runtime_config_blob;
3433
public bool have_assemblies_blob;
3534
public bool marshal_methods_enabled;
3635
public bool ignore_split_configs;

‎src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ sealed class XamarinAndroidBundledAssembly
182182
public bool BrokenExceptionTransitions { get; set; }
183183
public global::Android.Runtime.BoundExceptionType BoundExceptionType { get; set; }
184184
public bool JniAddNativeMethodRegistrationAttributePresent { get; set; }
185-
public bool HaveRuntimeConfigBlob { get; set; }
186185
public bool HaveAssemblyStore { get; set; }
187186
public int NumberOfAssembliesInApk { get; set; }
188187
public int BundledAssemblyNameWidth { get; set; } // including the trailing NUL
@@ -238,7 +237,6 @@ protected override void Construct (LlvmIrModule module)
238237
uses_assembly_preload = UsesAssemblyPreload,
239238
broken_exception_transitions = BrokenExceptionTransitions,
240239
jni_add_native_method_registration_attribute_present = JniAddNativeMethodRegistrationAttributePresent,
241-
have_runtime_config_blob = HaveRuntimeConfigBlob,
242240
have_assemblies_blob = HaveAssemblyStore,
243241
marshal_methods_enabled = MarshalMethodsEnabled,
244242
managed_marshal_methods_lookup_enabled = ManagedMarshalMethodsLookupEnabled,

‎src/native/mono/xamarin-app-stub/application_dso_stub.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ const ApplicationConfig application_config = {
4848
.uses_assembly_preload = false,
4949
.broken_exception_transitions = false,
5050
.jni_add_native_method_registration_attribute_present = false,
51-
.have_runtime_config_blob = false,
5251
.have_assembly_store = false,
5352
.marshal_methods_enabled = false,
5453
.ignore_split_configs = false,

‎src/native/mono/xamarin-app-stub/xamarin-app.hh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ struct ApplicationConfig
238238
bool uses_assembly_preload;
239239
bool broken_exception_transitions;
240240
bool jni_add_native_method_registration_attribute_present;
241-
bool have_runtime_config_blob;
242241
bool have_assembly_store;
243242
bool marshal_methods_enabled;
244243
bool ignore_split_configs;

0 commit comments

Comments
 (0)