Skip to content

Commit dc0ceec

Browse files
author
Jo Shields
committed
Revert "Remove the last month and a half of debug spew"
This reverts commit d5978f7.
1 parent d5978f7 commit dc0ceec

File tree

10 files changed

+16
-6
lines changed

10 files changed

+16
-6
lines changed

‎build-tools/scripts/TestApks.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
WriteOutputAsMessage="True"
8484
/>
8585
<Xamarin.Android.Tools.BootstrapTasks.Adb
86-
Arguments="$(_AdbTarget) shell setprop debug.mono.log timing"
86+
Arguments="$(_AdbTarget) shell setprop debug.mono.log timing,gref"
8787
IgnoreExitCode="True"
8888
ToolExe="$(AdbToolExe)"
8989
ToolPath="$(AdbToolPath)"
@@ -273,6 +273,7 @@
273273
AddResults="true"
274274
LabelSuffix="-$(Configuration)$(TestsFlavor)"
275275
Activity="%(_AllArchives.Activity)" />
276+
<Exec Command="adb shell run-as %(_AllArchives.Package) cat files/.__override__/grefs.txt" IgnoreExitCode="True" />
276277
</Target>
277278
<Target Name="RenameTestCases">
278279
<Error

‎src/Mono.Android/Android.Runtime/ConstructorBuilder.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ internal class ConstructorBuilder {
3838
il.Emit (OpCodes.Ldc_I4, i);
3939
il.Emit (OpCodes.Ldelem_Ref);
4040
}
41+
4142
il.Emit (OpCodes.Call, cinfo);
4243

4344
il.Emit (OpCodes.Ret);

‎src/Mono.Android/Test/Properties/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Mono.Android_Tests">
33
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
4-
<application android:label="Xamarin.Android.RuntimeTests" android:name="android.apptests.App" android:usesCleartextTraffic="true">
4+
<application android:label="Xamarin.Android.RuntimeTests" android:name="android.apptests.App" android:usesCleartextTraffic="true" android:debuggable="true">
55
<activity android:name="android.apptests.RenamedActivity" android:configChanges="keyboardHidden" />
66
</application>
77
<uses-permission android:name="android.permission.INTERNET" />

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Environment.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
debug.mono.log=gref

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@
9191
<Compile Include="Common\DotNetXamarinProject.cs" />
9292
<Compile Include="XABuildPaths.cs" />
9393
</ItemGroup>
94+
<ItemGroup>
95+
<AndroidEnvironment Include="Environment.txt" />
96+
</ItemGroup>
9497
<ItemGroup>
9598
<EmbeddedResource Include="Resources\Wear\LayoutMain.axml">
9699
<LogicalName>Xamarin.ProjectTools.Resources.Wear.LayoutMain.axml</LogicalName>

‎src/monodroid/jni/osbridge.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ OSBridge::_write_stack_trace (FILE *to, const char *from)
222222
void
223223
OSBridge::_monodroid_gref_log (const char *message)
224224
{
225+
log_info (LOG_GREF, "%s", message);
225226
if (!gref_log)
226227
return;
227228
fprintf (gref_log, "%s", message);

‎tests/Xamarin.Forms-Performance-Integration/Droid/Environment.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
debug.mono.log=gref

‎tests/Xamarin.Forms-Performance-Integration/Droid/Properties/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="Xamarin.Forms_Performance_Integration">
33
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" />
4-
<application android:label="Xamarin.Forms.Performance.Integration"></application>
5-
</manifest>
4+
<application android:label="Xamarin.Forms.Performance.Integration" android:debuggable="true"></application>
5+
</manifest>

‎tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<AndroidManagedSymbols>true</AndroidManagedSymbols>
4545
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
4646
<AndroidLinkTool Condition=" '$(AndroidLinkTool)' == '' ">r8</AndroidLinkTool>
47-
<AndroidGenerateJniMarshalMethods Condition=" '$(HostOS)' == 'Darwin' ">True</AndroidGenerateJniMarshalMethods>
4847
</PropertyGroup>
4948
<ItemGroup>
5049
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
@@ -262,6 +261,9 @@
262261
<AndroidResource Include="Resources\layout\Toolbar.axml" />
263262
<AndroidResource Include="Resources\values\styles.xml" />
264263
</ItemGroup>
264+
<ItemGroup>
265+
<AndroidEnvironment Include="Environment.txt" />
266+
</ItemGroup>
265267
<Import Project="Xamarin.Forms.Performance.Integration.Droid.targets" />
266268
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
267269
<Import Project="..\..\..\packages\Xamarin.Forms.4.0.0.425677\build\netstandard2.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\packages\Xamarin.Forms.4.0.0.425677\build\netstandard2.0\Xamarin.Forms.targets')" />

‎tests/Xamarin.Forms-Performance-Integration/Xamarin.Forms.Performance.Integration.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
<PackageReference Include="Xam.Plugin.Connectivity" Version="3.1.1" />
1313
<PackageReference Include="Xamarin.Forms" Version="3.1.0.583944" />
1414
</ItemGroup>
15-
</Project>
15+
</Project>

0 commit comments

Comments
 (0)