Skip to content

Commit 4488c48

Browse files
grendellogrendello
authored
[Xamarin.Android.Build.Tasks] Enable LLVM marshal methods by default (#9551)
Context: afb5f7e Context: 27b5d2e This reverts commit afb5f7e which disabled LLVM Marshal Methods. The problem which caused Blazer (and some other) applications to fail was fixed in 27b5d2e.
1 parent 22c4633 commit 4488c48

File tree

3 files changed

+50
-53
lines changed

3 files changed

+50
-53
lines changed

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
"Size": 3036
66
},
77
"classes.dex": {
8-
"Size": 389672
8+
"Size": 22488
99
},
1010
"lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
1111
"Size": 18208
1212
},
1313
"lib/arm64-v8a/lib_Java.Interop.dll.so": {
14-
"Size": 86256
14+
"Size": 86368
1515
},
1616
"lib/arm64-v8a/lib_Mono.Android.dll.so": {
17-
"Size": 115344
17+
"Size": 115752
1818
},
1919
"lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
20-
"Size": 22400
20+
"Size": 22408
2121
},
2222
"lib/arm64-v8a/lib_System.Console.dll.so": {
2323
"Size": 24384
@@ -26,7 +26,7 @@
2626
"Size": 26480
2727
},
2828
"lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
29-
"Size": 633920
29+
"Size": 633792
3030
},
3131
"lib/arm64-v8a/lib_System.Runtime.dll.so": {
3232
"Size": 20048
@@ -44,7 +44,7 @@
4444
"Size": 87432
4545
},
4646
"lib/arm64-v8a/libmonodroid.so": {
47-
"Size": 485400
47+
"Size": 485800
4848
},
4949
"lib/arm64-v8a/libmonosgen-2.0.so": {
5050
"Size": 3196336
@@ -62,10 +62,10 @@
6262
"Size": 160232
6363
},
6464
"lib/arm64-v8a/libxamarin-app.so": {
65-
"Size": 12648
65+
"Size": 17912
6666
},
6767
"META-INF/BNDLTOOL.RSA": {
68-
"Size": 1223
68+
"Size": 1221
6969
},
7070
"META-INF/BNDLTOOL.SF": {
7171
"Size": 3266
@@ -98,5 +98,5 @@
9898
"Size": 1904
9999
}
100100
},
101-
"PackageSize": 2865685
101+
"PackageSize": 2791957
102102
}

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc‎

Lines changed: 40 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
"Size": 6652
66
},
77
"classes.dex": {
8-
"Size": 9448924
9-
},
10-
"classes2.dex": {
11-
"Size": 154180
8+
"Size": 9172800
129
},
1310
"kotlin/annotation/annotation.kotlin_builtins": {
1411
"Size": 928
@@ -35,25 +32,25 @@
3532
"Size": 19456
3633
},
3734
"lib/arm64-v8a/lib_FormsViewGroup.dll.so": {
38-
"Size": 25184
35+
"Size": 25424
3936
},
4037
"lib/arm64-v8a/lib_Java.Interop.dll.so": {
41-
"Size": 94640
38+
"Size": 94768
4239
},
4340
"lib/arm64-v8a/lib_Mono.Android.dll.so": {
44-
"Size": 521824
41+
"Size": 523568
4542
},
4643
"lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
47-
"Size": 22400
44+
"Size": 22408
4845
},
4946
"lib/arm64-v8a/lib_mscorlib.dll.so": {
50-
"Size": 21440
47+
"Size": 21432
5148
},
5249
"lib/arm64-v8a/lib_netstandard.dll.so": {
5350
"Size": 23080
5451
},
5552
"lib/arm64-v8a/lib_System.Collections.Concurrent.dll.so": {
56-
"Size": 29800
53+
"Size": 29808
5754
},
5855
"lib/arm64-v8a/lib_System.Collections.dll.so": {
5956
"Size": 36288
@@ -68,13 +65,13 @@
6865
"Size": 19584
6966
},
7067
"lib/arm64-v8a/lib_System.ComponentModel.Primitives.dll.so": {
71-
"Size": 21296
68+
"Size": 21304
7269
},
7370
"lib/arm64-v8a/lib_System.ComponentModel.TypeConverter.dll.so": {
74-
"Size": 42448
71+
"Size": 42456
7572
},
7673
"lib/arm64-v8a/lib_System.Console.dll.so": {
77-
"Size": 24416
74+
"Size": 24424
7875
},
7976
"lib/arm64-v8a/lib_System.Core.dll.so": {
8077
"Size": 19456
@@ -83,7 +80,7 @@
8380
"Size": 28440
8481
},
8582
"lib/arm64-v8a/lib_System.Diagnostics.TraceSource.dll.so": {
86-
"Size": 24688
83+
"Size": 24696
8784
},
8885
"lib/arm64-v8a/lib_System.dll.so": {
8986
"Size": 19856
@@ -98,7 +95,7 @@
9895
"Size": 49936
9996
},
10097
"lib/arm64-v8a/lib_System.IO.Compression.Brotli.dll.so": {
101-
"Size": 29480
98+
"Size": 29488
10299
},
103100
"lib/arm64-v8a/lib_System.IO.Compression.dll.so": {
104101
"Size": 33784
@@ -110,13 +107,13 @@
110107
"Size": 38736
111108
},
112109
"lib/arm64-v8a/lib_System.Linq.Expressions.dll.so": {
113-
"Size": 185808
110+
"Size": 185816
114111
},
115112
"lib/arm64-v8a/lib_System.Net.Http.dll.so": {
116-
"Size": 89496
113+
"Size": 89488
117114
},
118115
"lib/arm64-v8a/lib_System.Net.Primitives.dll.so": {
119-
"Size": 41120
116+
"Size": 41112
120117
},
121118
"lib/arm64-v8a/lib_System.Net.Requests.dll.so": {
122119
"Size": 21552
@@ -125,19 +122,19 @@
125122
"Size": 27072
126123
},
127124
"lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
128-
"Size": 956408
125+
"Size": 956368
129126
},
130127
"lib/arm64-v8a/lib_System.Private.DataContractSerialization.dll.so": {
131128
"Size": 216688
132129
},
133130
"lib/arm64-v8a/lib_System.Private.Uri.dll.so": {
134-
"Size": 62192
131+
"Size": 62184
135132
},
136133
"lib/arm64-v8a/lib_System.Private.Xml.dll.so": {
137-
"Size": 237104
134+
"Size": 237096
138135
},
139136
"lib/arm64-v8a/lib_System.Private.Xml.Linq.dll.so": {
140-
"Size": 35584
137+
"Size": 35592
141138
},
142139
"lib/arm64-v8a/lib_System.Runtime.dll.so": {
143140
"Size": 20200
@@ -146,22 +143,22 @@
146143
"Size": 21592
147144
},
148145
"lib/arm64-v8a/lib_System.Runtime.Numerics.dll.so": {
149-
"Size": 54408
146+
"Size": 54400
150147
},
151148
"lib/arm64-v8a/lib_System.Runtime.Serialization.dll.so": {
152-
"Size": 19352
149+
"Size": 19360
153150
},
154151
"lib/arm64-v8a/lib_System.Runtime.Serialization.Formatters.dll.so": {
155152
"Size": 20336
156153
},
157154
"lib/arm64-v8a/lib_System.Runtime.Serialization.Primitives.dll.so": {
158-
"Size": 21448
155+
"Size": 21456
159156
},
160157
"lib/arm64-v8a/lib_System.Security.Cryptography.dll.so": {
161-
"Size": 80504
158+
"Size": 80496
162159
},
163160
"lib/arm64-v8a/lib_System.Text.RegularExpressions.dll.so": {
164-
"Size": 183592
161+
"Size": 183600
165162
},
166163
"lib/arm64-v8a/lib_System.Xml.dll.so": {
167164
"Size": 19256
@@ -173,31 +170,31 @@
173170
"Size": 22096
174171
},
175172
"lib/arm64-v8a/lib_Xamarin.AndroidX.Activity.dll.so": {
176-
"Size": 34760
173+
"Size": 34960
177174
},
178175
"lib/arm64-v8a/lib_Xamarin.AndroidX.AppCompat.AppCompatResources.dll.so": {
179-
"Size": 24296
176+
"Size": 24520
180177
},
181178
"lib/arm64-v8a/lib_Xamarin.AndroidX.AppCompat.dll.so": {
182-
"Size": 163072
179+
"Size": 163240
183180
},
184181
"lib/arm64-v8a/lib_Xamarin.AndroidX.CardView.dll.so": {
185182
"Size": 24560
186183
},
187184
"lib/arm64-v8a/lib_Xamarin.AndroidX.CoordinatorLayout.dll.so": {
188-
"Size": 35680
185+
"Size": 35912
189186
},
190187
"lib/arm64-v8a/lib_Xamarin.AndroidX.Core.dll.so": {
191-
"Size": 151216
188+
"Size": 151408
192189
},
193190
"lib/arm64-v8a/lib_Xamarin.AndroidX.CursorAdapter.dll.so": {
194191
"Size": 27168
195192
},
196193
"lib/arm64-v8a/lib_Xamarin.AndroidX.DrawerLayout.dll.so": {
197-
"Size": 33760
194+
"Size": 33944
198195
},
199196
"lib/arm64-v8a/lib_Xamarin.AndroidX.Fragment.dll.so": {
200-
"Size": 72224
197+
"Size": 72528
201198
},
202199
"lib/arm64-v8a/lib_Xamarin.AndroidX.Legacy.Support.Core.UI.dll.so": {
203200
"Size": 23896
@@ -215,16 +212,16 @@
215212
"Size": 31592
216213
},
217214
"lib/arm64-v8a/lib_Xamarin.AndroidX.RecyclerView.dll.so": {
218-
"Size": 111896
215+
"Size": 112256
219216
},
220217
"lib/arm64-v8a/lib_Xamarin.AndroidX.SavedState.dll.so": {
221218
"Size": 23144
222219
},
223220
"lib/arm64-v8a/lib_Xamarin.AndroidX.SwipeRefreshLayout.dll.so": {
224-
"Size": 31672
221+
"Size": 31952
225222
},
226223
"lib/arm64-v8a/lib_Xamarin.AndroidX.ViewPager.dll.so": {
227-
"Size": 37752
224+
"Size": 38056
228225
},
229226
"lib/arm64-v8a/lib_Xamarin.Forms.Core.dll.so": {
230227
"Size": 581000
@@ -239,7 +236,7 @@
239236
"Size": 80632
240237
},
241238
"lib/arm64-v8a/lib_Xamarin.Google.Android.Material.dll.so": {
242-
"Size": 84400
239+
"Size": 84768
243240
},
244241
"lib/arm64-v8a/libarc.bin.so": {
245242
"Size": 18776
@@ -248,7 +245,7 @@
248245
"Size": 87432
249246
},
250247
"lib/arm64-v8a/libmonodroid.so": {
251-
"Size": 485400
248+
"Size": 485800
252249
},
253250
"lib/arm64-v8a/libmonosgen-2.0.so": {
254251
"Size": 3196336
@@ -266,7 +263,7 @@
266263
"Size": 160232
267264
},
268265
"lib/arm64-v8a/libxamarin-app.so": {
269-
"Size": 119928
266+
"Size": 349352
270267
},
271268
"META-INF/androidx.activity_activity.version": {
272269
"Size": 6
@@ -422,7 +419,7 @@
422419
"Size": 1221
423420
},
424421
"META-INF/BNDLTOOL.SF": {
425-
"Size": 98661
422+
"Size": 98577
426423
},
427424
"META-INF/com.android.tools/proguard/coroutines.pro": {
428425
"Size": 1345
@@ -449,7 +446,7 @@
449446
"Size": 5
450447
},
451448
"META-INF/MANIFEST.MF": {
452-
"Size": 98534
449+
"Size": 98450
453450
},
454451
"META-INF/maven/com.google.guava/listenablefuture/pom.properties": {
455452
"Size": 96
@@ -2489,5 +2486,5 @@
24892486
"Size": 812848
24902487
}
24912488
},
2492-
"PackageSize": 10673477
2489+
"PackageSize": 10628363
24932490
}

‎src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
324324
<AndroidUseAssemblyStore Condition=" '$(AndroidUseAssemblyStore)' == '' ">true</AndroidUseAssemblyStore>
325325
<AndroidAotEnableLazyLoad Condition=" '$(AndroidAotEnableLazyLoad)' == '' And '$(AotAssemblies)' == 'true' And '$(AndroidIncludeDebugSymbols)' != 'true' ">True</AndroidAotEnableLazyLoad>
326326
<AndroidEnableMarshalMethods Condition=" '$(AndroidEnableMarshalMethods)' == '' and ('$(UsingMicrosoftNETSdkRazor)' == 'true') ">False</AndroidEnableMarshalMethods>
327-
<AndroidEnableMarshalMethods Condition=" '$(AndroidEnableMarshalMethods)' == '' ">False</AndroidEnableMarshalMethods>
327+
<AndroidEnableMarshalMethods Condition=" '$(AndroidEnableMarshalMethods)' == '' ">True</AndroidEnableMarshalMethods>
328328
<_AndroidUseMarshalMethods Condition=" '$(AndroidIncludeDebugSymbols)' == 'True' ">False</_AndroidUseMarshalMethods>
329329
<_AndroidUseMarshalMethods Condition=" '$(AndroidIncludeDebugSymbols)' != 'True' ">$(AndroidEnableMarshalMethods)</_AndroidUseMarshalMethods>
330330
</PropertyGroup>

0 commit comments

Comments
 (0)