Skip to content

Commit 9b88ce7

Browse files
grendellogrendello
authored
[performance] Improve speed of our CRC-64 hasher (#624)
Modify the `Crc64` implementation to use splicing in order to process data in a smaller number of iterations, at the expense of a bit more memory for the extra tables. A quick test of calculating checksum for a 1GB file shows a ~5.5x improvement: Allocating 1043332542 bytes to hold file data Reading file 'android-ndk-r21-linux-x86_64.zip' into memory Calculating checksum using the old method... Hash: 197913BA13B9A1CC; Time: 00:00:04.0649818 Calculating checksum using the new method... Hash: 8203D033719B6B96; Time: 00:00:00.7251845 The calculated hash is different (although still stable and correct) because the new code uses tables generated using a slightly different set of parameters. Instead of using a single lookup table, the new code takes the [slice-by-8 approach][0] which processes 8 bytes at a time, using 8 lookup tables instead of one. [Pycrc][1] was used to generate the `crc_update()` and `crc_reflect()` methods, which were then ported to C# in [`gen-crc-tables.cs`][2], via: pycrc.py --model crc-64-jones --std=C99 --algorithm bbf --generate {h,c} --reflect-out=true Because the calculated hash now differs, we've changed the output prefix from `crc64` to `c64r2`, to make the change slightly more prominent and obvious. Preliminary integration into xamarin-android shows build improvements for a small Xamarin.Forms app, Debug configuration: * First build: Time Elapsed 00:00:36.74 (master) Time Elapsed 00:00:34.43 (crc64) * Incremental build (`.cs` file touched): Time Elapsed 00:00:08.68 (master) Time Elapsed 00:00:08.51 (crc64) And for `<GenerateJavaStubs/>` task, which outputs 9.5MB of data: * First build: 606 ms GenerateJavaStubs 1 calls (master) 570 ms GenerateJavaStubs 1 calls (crc64) * Incremental build: 702 ms GenerateJavaStubs 1 calls (master) 617 ms GenerateJavaStubs 1 calls (crc64) [0]: https://create.stephan-brumme.com/crc32/#slicing-by-8-overview [1]: https://pycrc.org/index.html [2]: https://gist.github.com/grendello/fdb968c795c310b389c611cb8c2fd7d5#file-gen-crc-tables-cs const ulong POLY = 0xad93d23594c935a9; static ulong[,] table = new ulong[8,256]; static ulong crc_reflect (ulong data, ulong data_len) { uint i; ulong ret; ret = data & 0x01; for (i = 1; i < data_len; i++) { data >>= 1; ret = (ret << 1) | (data & 0x01); } return ret; } static ulong crc_update (ulong crc, byte[] data) { int idx = 0; uint i; bool bit; byte c; int data_len = data.Length; while (data_len-- > 0) { c = data[idx]; for (i = 0x01; (i & 0xff) != 0; i <<= 1) { bit = (crc & 0x8000000000000000) != 0; if ((c & i) != 0) { bit = !bit; } crc <<= 1; if (bit) { crc ^= POLY; } } crc &= 0xffffffffffffffff; } crc &= 0xffffffffffffffff; return crc_reflect (crc, 64) ^ 0x0000000000000000; } static void GenerateTable () { ulong crc; byte[] b = { 0 }; for (int n = 0; n < 256; n++) { b[0] = (byte)n; table[0,n] = crc_update (0, b); } for (ulong n = 0; n < 256; n++) { crc = table[0,n]; for (ulong k = 1; k < 8; k++) { crc = table[0,crc & 0xff] ^ (crc >> 8); table[k,n] = crc; } } Console.WriteLine ("static readonly ulong[,] Table = {"); for (int i = 0; i < 8; i++) { Console.WriteLine ("\t{"); for (int j = 0; j < 256; j++) { if (j > 0) { Console.Write (", "); } else { Console.Write ("\t\t"); } if (j % 4 == 0) { Console.WriteLine (); Console.Write ("\t\t"); } Console.Write ("0x"); Console.Write (table[i,j].ToString ("x16")); } Console.WriteLine (); Console.WriteLine ("\t},"); } Console.WriteLine ("};"); }
1 parent 1032c0e commit 9b88ce7

File tree

9 files changed

+596
-162
lines changed

9 files changed

+596
-162
lines changed

‎src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
56
</PropertyGroup>
67

78
<PropertyGroup>

‎src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/Crc64.Table.cs

Lines changed: 536 additions & 0 deletions
Large diffs are not rendered by default.

‎src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/Crc64.cs

Lines changed: 34 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -35,144 +35,15 @@ namespace Java.Interop.Tools.JavaCallableWrappers
3535
{
3636
/// <summary>
3737
/// CRC64 variant: crc-64-jones 64-bit
38-
/// * Poly: 0xad93d23594c935a9
38+
/// * Poly: 0xad93d23594c935a9
39+
///
3940
/// Changes beyond initial implementation:
40-
/// * Starting Value: ulong.MaxValue
41-
/// * XOR length in HashFinal()
41+
/// * Starting Value: ulong.MaxValue
42+
/// * XOR length in HashFinal()
43+
/// * Using spliced table for faster processing
4244
/// </summary>
43-
public class Crc64 : HashAlgorithm
45+
public partial class Crc64 : HashAlgorithm
4446
{
45-
static readonly ulong [] Table = {
46-
0x0000000000000000, 0x7ad870c830358979,
47-
0xf5b0e190606b12f2, 0x8f689158505e9b8b,
48-
0xc038e5739841b68f, 0xbae095bba8743ff6,
49-
0x358804e3f82aa47d, 0x4f50742bc81f2d04,
50-
0xab28ecb46814fe75, 0xd1f09c7c5821770c,
51-
0x5e980d24087fec87, 0x24407dec384a65fe,
52-
0x6b1009c7f05548fa, 0x11c8790fc060c183,
53-
0x9ea0e857903e5a08, 0xe478989fa00bd371,
54-
0x7d08ff3b88be6f81, 0x07d08ff3b88be6f8,
55-
0x88b81eabe8d57d73, 0xf2606e63d8e0f40a,
56-
0xbd301a4810ffd90e, 0xc7e86a8020ca5077,
57-
0x4880fbd87094cbfc, 0x32588b1040a14285,
58-
0xd620138fe0aa91f4, 0xacf86347d09f188d,
59-
0x2390f21f80c18306, 0x594882d7b0f40a7f,
60-
0x1618f6fc78eb277b, 0x6cc0863448deae02,
61-
0xe3a8176c18803589, 0x997067a428b5bcf0,
62-
0xfa11fe77117cdf02, 0x80c98ebf2149567b,
63-
0x0fa11fe77117cdf0, 0x75796f2f41224489,
64-
0x3a291b04893d698d, 0x40f16bccb908e0f4,
65-
0xcf99fa94e9567b7f, 0xb5418a5cd963f206,
66-
0x513912c379682177, 0x2be1620b495da80e,
67-
0xa489f35319033385, 0xde51839b2936bafc,
68-
0x9101f7b0e12997f8, 0xebd98778d11c1e81,
69-
0x64b116208142850a, 0x1e6966e8b1770c73,
70-
0x8719014c99c2b083, 0xfdc17184a9f739fa,
71-
0x72a9e0dcf9a9a271, 0x08719014c99c2b08,
72-
0x4721e43f0183060c, 0x3df994f731b68f75,
73-
0xb29105af61e814fe, 0xc849756751dd9d87,
74-
0x2c31edf8f1d64ef6, 0x56e99d30c1e3c78f,
75-
0xd9810c6891bd5c04, 0xa3597ca0a188d57d,
76-
0xec09088b6997f879, 0x96d1784359a27100,
77-
0x19b9e91b09fcea8b, 0x636199d339c963f2,
78-
0xdf7adabd7a6e2d6f, 0xa5a2aa754a5ba416,
79-
0x2aca3b2d1a053f9d, 0x50124be52a30b6e4,
80-
0x1f423fcee22f9be0, 0x659a4f06d21a1299,
81-
0xeaf2de5e82448912, 0x902aae96b271006b,
82-
0x74523609127ad31a, 0x0e8a46c1224f5a63,
83-
0x81e2d7997211c1e8, 0xfb3aa75142244891,
84-
0xb46ad37a8a3b6595, 0xceb2a3b2ba0eecec,
85-
0x41da32eaea507767, 0x3b024222da65fe1e,
86-
0xa2722586f2d042ee, 0xd8aa554ec2e5cb97,
87-
0x57c2c41692bb501c, 0x2d1ab4dea28ed965,
88-
0x624ac0f56a91f461, 0x1892b03d5aa47d18,
89-
0x97fa21650afae693, 0xed2251ad3acf6fea,
90-
0x095ac9329ac4bc9b, 0x7382b9faaaf135e2,
91-
0xfcea28a2faafae69, 0x8632586aca9a2710,
92-
0xc9622c4102850a14, 0xb3ba5c8932b0836d,
93-
0x3cd2cdd162ee18e6, 0x460abd1952db919f,
94-
0x256b24ca6b12f26d, 0x5fb354025b277b14,
95-
0xd0dbc55a0b79e09f, 0xaa03b5923b4c69e6,
96-
0xe553c1b9f35344e2, 0x9f8bb171c366cd9b,
97-
0x10e3202993385610, 0x6a3b50e1a30ddf69,
98-
0x8e43c87e03060c18, 0xf49bb8b633338561,
99-
0x7bf329ee636d1eea, 0x012b592653589793,
100-
0x4e7b2d0d9b47ba97, 0x34a35dc5ab7233ee,
101-
0xbbcbcc9dfb2ca865, 0xc113bc55cb19211c,
102-
0x5863dbf1e3ac9dec, 0x22bbab39d3991495,
103-
0xadd33a6183c78f1e, 0xd70b4aa9b3f20667,
104-
0x985b3e827bed2b63, 0xe2834e4a4bd8a21a,
105-
0x6debdf121b863991, 0x1733afda2bb3b0e8,
106-
0xf34b37458bb86399, 0x8993478dbb8deae0,
107-
0x06fbd6d5ebd3716b, 0x7c23a61ddbe6f812,
108-
0x3373d23613f9d516, 0x49aba2fe23cc5c6f,
109-
0xc6c333a67392c7e4, 0xbc1b436e43a74e9d,
110-
0x95ac9329ac4bc9b5, 0xef74e3e19c7e40cc,
111-
0x601c72b9cc20db47, 0x1ac40271fc15523e,
112-
0x5594765a340a7f3a, 0x2f4c0692043ff643,
113-
0xa02497ca54616dc8, 0xdafce7026454e4b1,
114-
0x3e847f9dc45f37c0, 0x445c0f55f46abeb9,
115-
0xcb349e0da4342532, 0xb1eceec59401ac4b,
116-
0xfebc9aee5c1e814f, 0x8464ea266c2b0836,
117-
0x0b0c7b7e3c7593bd, 0x71d40bb60c401ac4,
118-
0xe8a46c1224f5a634, 0x927c1cda14c02f4d,
119-
0x1d148d82449eb4c6, 0x67ccfd4a74ab3dbf,
120-
0x289c8961bcb410bb, 0x5244f9a98c8199c2,
121-
0xdd2c68f1dcdf0249, 0xa7f41839ecea8b30,
122-
0x438c80a64ce15841, 0x3954f06e7cd4d138,
123-
0xb63c61362c8a4ab3, 0xcce411fe1cbfc3ca,
124-
0x83b465d5d4a0eece, 0xf96c151de49567b7,
125-
0x76048445b4cbfc3c, 0x0cdcf48d84fe7545,
126-
0x6fbd6d5ebd3716b7, 0x15651d968d029fce,
127-
0x9a0d8ccedd5c0445, 0xe0d5fc06ed698d3c,
128-
0xaf85882d2576a038, 0xd55df8e515432941,
129-
0x5a3569bd451db2ca, 0x20ed197575283bb3,
130-
0xc49581ead523e8c2, 0xbe4df122e51661bb,
131-
0x3125607ab548fa30, 0x4bfd10b2857d7349,
132-
0x04ad64994d625e4d, 0x7e7514517d57d734,
133-
0xf11d85092d094cbf, 0x8bc5f5c11d3cc5c6,
134-
0x12b5926535897936, 0x686de2ad05bcf04f,
135-
0xe70573f555e26bc4, 0x9ddd033d65d7e2bd,
136-
0xd28d7716adc8cfb9, 0xa85507de9dfd46c0,
137-
0x273d9686cda3dd4b, 0x5de5e64efd965432,
138-
0xb99d7ed15d9d8743, 0xc3450e196da80e3a,
139-
0x4c2d9f413df695b1, 0x36f5ef890dc31cc8,
140-
0x79a59ba2c5dc31cc, 0x037deb6af5e9b8b5,
141-
0x8c157a32a5b7233e, 0xf6cd0afa9582aa47,
142-
0x4ad64994d625e4da, 0x300e395ce6106da3,
143-
0xbf66a804b64ef628, 0xc5bed8cc867b7f51,
144-
0x8aeeace74e645255, 0xf036dc2f7e51db2c,
145-
0x7f5e4d772e0f40a7, 0x05863dbf1e3ac9de,
146-
0xe1fea520be311aaf, 0x9b26d5e88e0493d6,
147-
0x144e44b0de5a085d, 0x6e963478ee6f8124,
148-
0x21c640532670ac20, 0x5b1e309b16452559,
149-
0xd476a1c3461bbed2, 0xaeaed10b762e37ab,
150-
0x37deb6af5e9b8b5b, 0x4d06c6676eae0222,
151-
0xc26e573f3ef099a9, 0xb8b627f70ec510d0,
152-
0xf7e653dcc6da3dd4, 0x8d3e2314f6efb4ad,
153-
0x0256b24ca6b12f26, 0x788ec2849684a65f,
154-
0x9cf65a1b368f752e, 0xe62e2ad306bafc57,
155-
0x6946bb8b56e467dc, 0x139ecb4366d1eea5,
156-
0x5ccebf68aecec3a1, 0x2616cfa09efb4ad8,
157-
0xa97e5ef8cea5d153, 0xd3a62e30fe90582a,
158-
0xb0c7b7e3c7593bd8, 0xca1fc72bf76cb2a1,
159-
0x45775673a732292a, 0x3faf26bb9707a053,
160-
0x70ff52905f188d57, 0x0a2722586f2d042e,
161-
0x854fb3003f739fa5, 0xff97c3c80f4616dc,
162-
0x1bef5b57af4dc5ad, 0x61372b9f9f784cd4,
163-
0xee5fbac7cf26d75f, 0x9487ca0fff135e26,
164-
0xdbd7be24370c7322, 0xa10fceec0739fa5b,
165-
0x2e675fb4576761d0, 0x54bf2f7c6752e8a9,
166-
0xcdcf48d84fe75459, 0xb71738107fd2dd20,
167-
0x387fa9482f8c46ab, 0x42a7d9801fb9cfd2,
168-
0x0df7adabd7a6e2d6, 0x772fdd63e7936baf,
169-
0xf8474c3bb7cdf024, 0x829f3cf387f8795d,
170-
0x66e7a46c27f3aa2c, 0x1c3fd4a417c62355,
171-
0x935745fc4798b8de, 0xe98f353477ad31a7,
172-
0xa6df411fbfb21ca3, 0xdc0731d78f8795da,
173-
0x536fa08fdfd90e51, 0x29b7d047efec8728,
174-
};
175-
17647
ulong crc = ulong.MaxValue;
17748
ulong length = 0;
17849

@@ -182,11 +53,36 @@ public override void Initialize ()
18253
length = 0;
18354
}
18455

185-
protected override void HashCore (byte [] array, int ibStart, int cbSize)
56+
unsafe protected override void HashCore (byte [] array, int ibStart, int cbSize)
18657
{
187-
for (int i = ibStart; i < cbSize; i++) {
188-
crc = Table [(byte) (crc ^ array [i])] ^ (crc >> 8);
58+
int len = cbSize;
59+
int idx = ibStart;
60+
61+
fixed (ulong* tptr = Table) {
62+
fixed (byte* aptr = array) {
63+
while (len >= 8) {
64+
crc ^= (ulong)aptr[idx];
65+
crc =
66+
tptr [7 * 256 + (crc & 0xff)] ^
67+
tptr [6 * 256 + ((crc >> 8) & 0xff)] ^
68+
tptr [5 * 256 + ((crc >> 16) & 0xff)] ^
69+
tptr [4 * 256 + ((crc >> 24) & 0xff)] ^
70+
tptr [3 * 256 + ((crc >> 32) & 0xff)] ^
71+
tptr [2 * 256 + ((crc >> 40) & 0xff)] ^
72+
tptr [1 * 256 + ((crc >> 48) & 0xff)] ^
73+
tptr [0 * 256 + (crc >> 56)];
74+
idx += 8;
75+
len -= 8;
76+
}
77+
78+
while (len > 0) {
79+
crc = tptr [0 * 256 + ((crc ^ aptr[idx]) & 0xff)] ^ (crc >> 8);
80+
idx++;
81+
len--;
82+
}
83+
}
18984
}
85+
19086
length += (ulong) cbSize;
19187
}
19288

‎src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class JniTypeName
4141
public
4242
#endif
4343
static class JavaNativeTypeManager {
44+
const string CRC_PREFIX = "c64r2";
4445

4546
public static PackageNamingPolicy PackageNamingPolicy { get; set; } = PackageNamingPolicy.LowercaseCrc64;
4647

@@ -201,7 +202,7 @@ public static string GetPackageName (Type type)
201202
return "assembly_" + (assemblyName.Replace ('.', '_') + "." + type.Namespace).ToLowerInvariant ();
202203
case PackageNamingPolicy.LowercaseCrc64:
203204
using (var crc = new Crc64 ())
204-
return "crc64" + ToHash (type.Namespace + ":" + assemblyName, crc);
205+
return CRC_PREFIX + ToHash (type.Namespace + ":" + assemblyName, crc);
205206
default:
206207
throw new NotSupportedException ($"PackageNamingPolicy.{PackageNamingPolicy} is no longer supported.");
207208
}
@@ -570,7 +571,7 @@ public static string GetPackageName (TypeDefinition type, TypeDefinitionCache ca
570571
return "assembly_" + (type.GetPartialAssemblyName (cache).Replace ('.', '_') + "." + type.Namespace).ToLowerInvariant ();
571572
case PackageNamingPolicy.LowercaseCrc64:
572573
using (var crc = new Crc64 ())
573-
return "crc64" + ToHash (type.Namespace + ":" + type.GetPartialAssemblyName (cache), crc);
574+
return CRC_PREFIX + ToHash (type.Namespace + ":" + type.GetPartialAssemblyName (cache), crc);
574575
default:
575576
throw new NotSupportedException ($"PackageNamingPolicy.{PackageNamingPolicy} is no longer supported.");
576577
}

‎tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/Crc64Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void Hello ()
3434
public void XmlDocument ()
3535
{
3636
var actual = ToHash ("System.Xml.XmlDocument, System.Xml");
37-
Assert.AreEqual ("348bbd9fecf1b865", actual);
37+
Assert.AreEqual ("b9c1bdfc7cd47543", actual);
3838
}
3939

4040
[Test]

‎tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public void GenerateIndirectApplication (
124124
)
125125
{
126126
var actual = Generate (typeof (IndirectApplication), applicationJavaClass);
127-
var expected = @"package crc64197ae30a36756915;
127+
var expected = @"package c64r2b57424eba1fa9d27;
128128
129129
130130
public class IndirectApplication
@@ -175,7 +175,7 @@ public void monodroidClearReferences ()
175175
public void GenerateExportedMembers ()
176176
{
177177
var actual = Generate (typeof (ExportsMembers));
178-
var expected = @"package crc64197ae30a36756915;
178+
var expected = @"package c64r2b57424eba1fa9d27;
179179
180180
181181
public class ExportsMembers
@@ -187,7 +187,7 @@ extends java.lang.Object
187187
public static final String __md_methods;
188188
static {
189189
__md_methods =
190-
""n_GetInstance:()Lcrc64197ae30a36756915/ExportsMembers;:__export__\n"" +
190+
""n_GetInstance:()Lc64r2b57424eba1fa9d27/ExportsMembers;:__export__\n"" +
191191
""n_GetValue:()Ljava/lang/String;:__export__\n"" +
192192
""n_methodNamesNotMangled:()V:__export__\n"" +
193193
""n_CompletelyDifferentName:(Ljava/lang/String;I)Ljava/lang/String;:__export__\n"" +
@@ -198,17 +198,17 @@ extends java.lang.Object
198198
}
199199
200200
201-
public static crc64197ae30a36756915.ExportsMembers STATIC_INSTANCE = GetInstance ();
201+
public static c64r2b57424eba1fa9d27.ExportsMembers STATIC_INSTANCE = GetInstance ();
202202
203203
204204
public java.lang.String VALUE = GetValue ();
205205
206-
public static crc64197ae30a36756915.ExportsMembers GetInstance ()
206+
public static c64r2b57424eba1fa9d27.ExportsMembers GetInstance ()
207207
{
208208
return n_GetInstance ();
209209
}
210210
211-
private static native crc64197ae30a36756915.ExportsMembers n_GetInstance ();
211+
private static native c64r2b57424eba1fa9d27.ExportsMembers n_GetInstance ();
212212
213213
public java.lang.String GetValue ()
214214
{
@@ -271,7 +271,7 @@ public void monodroidClearReferences ()
271271
public void GenerateInnerClass ()
272272
{
273273
var actual = Generate (typeof (ExampleOuterClass));
274-
var expected = @"package crc64197ae30a36756915;
274+
var expected = @"package c64r2b57424eba1fa9d27;
275275
276276
277277
public class ExampleOuterClass

‎tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaNativeTypeManagerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void TearDown ()
2929
public void Crc64 ()
3030
{
3131
JavaNativeTypeManager.PackageNamingPolicy = PackageNamingPolicy.LowercaseCrc64;
32-
Assert.AreEqual ("crc64b74743e9328eed0a", JavaNativeTypeManager.GetPackageName (typeof (string)));
32+
Assert.AreEqual ("c64r279bf423bcb581100", JavaNativeTypeManager.GetPackageName (typeof (string)));
3333
}
3434

3535
[Test]

‎tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGeneratorTests.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ public void WriteJavaToManaged ()
5959
"value-offset=" + offset + "\u0000" +
6060
GetJ2MEntryLine (typeof (ActivityName), "activity/Name", offset, length) +
6161
GetJ2MEntryLine (typeof (ApplicationName), "application/Name", offset, length) +
62-
GetJ2MEntryLine (typeof (DefaultName), "crc64197ae30a36756915/DefaultName", offset, length) +
63-
GetJ2MEntryLine (typeof (DefaultName.A), "crc64197ae30a36756915/DefaultName_A", offset, length) +
64-
GetJ2MEntryLine (typeof (DefaultName.A.B), "crc64197ae30a36756915/DefaultName_A_B", offset, length) +
65-
GetJ2MEntryLine (typeof (DefaultName.C.D), "crc64197ae30a36756915/DefaultName_C_D", offset, length) +
66-
GetJ2MEntryLine (typeof (ExampleOuterClass), "crc64197ae30a36756915/ExampleOuterClass", offset, length) +
67-
GetJ2MEntryLine (typeof (ExampleOuterClass.ExampleInnerClass), "crc64197ae30a36756915/ExampleOuterClass$ExampleOuterClass_ExampleInnerClass", offset, length) +
62+
GetJ2MEntryLine (typeof (DefaultName), "c64r2b57424eba1fa9d27/DefaultName", offset, length) +
63+
GetJ2MEntryLine (typeof (DefaultName.A), "c64r2b57424eba1fa9d27/DefaultName_A", offset, length) +
64+
GetJ2MEntryLine (typeof (DefaultName.A.B), "c64r2b57424eba1fa9d27/DefaultName_A_B", offset, length) +
65+
GetJ2MEntryLine (typeof (DefaultName.C.D), "c64r2b57424eba1fa9d27/DefaultName_C_D", offset, length) +
66+
GetJ2MEntryLine (typeof (ExampleOuterClass), "c64r2b57424eba1fa9d27/ExampleOuterClass", offset, length) +
67+
GetJ2MEntryLine (typeof (ExampleOuterClass.ExampleInnerClass), "c64r2b57424eba1fa9d27/ExampleOuterClass$ExampleOuterClass_ExampleInnerClass", offset, length) +
6868
GetJ2MEntryLine (typeof (InstrumentationName), "instrumentation/Name", offset, length) +
6969
GetJ2MEntryLine (typeof (AbstractClass), "my/AbstractClass", offset, length) +
7070
GetJ2MEntryLine (typeof (ExampleActivity), "my/ExampleActivity", offset, length) +
@@ -139,14 +139,14 @@ public void WriteManagedToJava ()
139139
GetM2JEntryLine (typeof (AbstractClassInvoker), "my/AbstractClass", offset, length) +
140140
GetM2JEntryLine (typeof (ActivityName), "activity/Name", offset, length) +
141141
GetM2JEntryLine (typeof (ApplicationName), "application/Name", offset, length) +
142-
GetM2JEntryLine (typeof (DefaultName.A.B), "crc64197ae30a36756915/DefaultName_A_B", offset, length) +
143-
GetM2JEntryLine (typeof (DefaultName.A), "crc64197ae30a36756915/DefaultName_A", offset, length) +
144-
GetM2JEntryLine (typeof (DefaultName.C.D), "crc64197ae30a36756915/DefaultName_C_D", offset, length) +
145-
GetM2JEntryLine (typeof (DefaultName), "crc64197ae30a36756915/DefaultName", offset, length) +
142+
GetM2JEntryLine (typeof (DefaultName.A.B), "c64r2b57424eba1fa9d27/DefaultName_A_B", offset, length) +
143+
GetM2JEntryLine (typeof (DefaultName.A), "c64r2b57424eba1fa9d27/DefaultName_A", offset, length) +
144+
GetM2JEntryLine (typeof (DefaultName.C.D), "c64r2b57424eba1fa9d27/DefaultName_C_D", offset, length) +
145+
GetM2JEntryLine (typeof (DefaultName), "c64r2b57424eba1fa9d27/DefaultName", offset, length) +
146146
GetM2JEntryLine (typeof (ExampleActivity), "my/ExampleActivity", offset, length) +
147147
GetM2JEntryLine (typeof (ExampleInstrumentation), "my/ExampleInstrumentation", offset, length) +
148-
GetM2JEntryLine (typeof (ExampleOuterClass.ExampleInnerClass), "crc64197ae30a36756915/ExampleOuterClass$ExampleOuterClass_ExampleInnerClass", offset, length) +
149-
GetM2JEntryLine (typeof (ExampleOuterClass), "crc64197ae30a36756915/ExampleOuterClass", offset, length) +
148+
GetM2JEntryLine (typeof (ExampleOuterClass.ExampleInnerClass), "c64r2b57424eba1fa9d27/ExampleOuterClass$ExampleOuterClass_ExampleInnerClass", offset, length) +
149+
GetM2JEntryLine (typeof (ExampleOuterClass), "c64r2b57424eba1fa9d27/ExampleOuterClass", offset, length) +
150150
GetM2JEntryLine (typeof (InstrumentationName), "instrumentation/Name", offset, length) +
151151
GetM2JEntryLine (typeof (NonStaticOuterClass.NonStaticInnerClass), "register/NonStaticOuterClass$NonStaticInnerClass", offset, length) +
152152
GetM2JEntryLine (typeof (NonStaticOuterClass), "register/NonStaticOuterClass", offset, length) +

‎tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<ProjectReference Include="..\..\src\Xamarin.Android.TOols.ApiXmlAdjuster\Xamarin.Android.Tools.ApiXmlAdjuster.csproj" />
20+
<ProjectReference Include="..\..\src\Xamarin.Android.Tools.ApiXmlAdjuster\Xamarin.Android.Tools.ApiXmlAdjuster.csproj" />
2121
</ItemGroup>
2222
</Project>

0 commit comments

Comments
 (0)