Skip to content

Commit 1d6b872

Browse files
committed
[WIP] Tests which use NDK native tools must target API 19 at least
1 parent 16ec728 commit 1d6b872

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/Xamarin.Android.Build.Tasks/Tasks/GetAotArguments.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,17 @@ int GetNdkApiLevel (NdkTools ndk, AndroidTargetArch arch)
125125
int level;
126126
if (manifest?.MinSdkVersion != null) {
127127
level = manifest.MinSdkVersion.Value;
128+
Log.LogDebugMessage ($"NDK API level read from manifest");
128129
} else if (int.TryParse (MinimumSupportedApiLevel, out level)) {
130+
Log.LogDebugMessage ("NDK API level taken from MinimumSupportedApiLevel");
129131
// level already set
130132
} else if (int.TryParse (AndroidApiLevel, out level)) {
133+
Log.LogDebugMessage ("NDK API level taken from AndroidApiLevel");
131134
// level already set
132135
} else {
133136
// Probably not ideal!
134137
level = MonoAndroidHelper.SupportedVersions.MaxStableVersion.ApiLevel;
138+
Log.LogDebugMessage ("NDK API level taken from MonoAndroidHelper.SupportedVersions.MaxStableVersion.ApiLevel");
135139
}
136140

137141
// Some Android API levels do not exist on the NDK level. Workaround this my mapping them to the
@@ -145,6 +149,7 @@ int GetNdkApiLevel (NdkTools ndk, AndroidTargetArch arch)
145149

146150
// API levels below level 21 do not provide support for 64-bit architectures.
147151
if (ndk.IsNdk64BitArch (arch) && level < 21) {
152+
Log.LogDebugMessage ("NDK API level raised to 21, required for 64-bit support");
148153
level = 21;
149154
}
150155

@@ -160,6 +165,7 @@ int GetNdkApiLevel (NdkTools ndk, AndroidTargetArch arch)
160165
}
161166
}
162167

168+
Log.LogDebugMessage ($"Using NDK API level {level}");
163169
return level;
164170
}
165171

tests/Mono.Android-Tests/Properties/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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">
3-
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
3+
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
44
<application android:debuggable="true" android:label="Xamarin.Android.RuntimeTests" android:name="android.apptests.App" android:usesCleartextTraffic="true">
55
<activity android:name="android.apptests.RenamedActivity" android:configChanges="keyboardHidden" />
66
</application>

tests/Mono.Android-Tests/Runtime-AppBundle/Properties/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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_TestsAppBundle">
3-
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
3+
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
44
<application android:label="Xamarin.Android.RuntimeTestsAppBundle" android:name="android.apptests.App" android:usesCleartextTraffic="true">
55
<activity android:name="android.apptests.RenamedActivity" android:configChanges="keyboardHidden" />
66
</application>

0 commit comments

Comments
 (0)