Skip to content

Commit 0d98493

Browse files
committed
[WIP] Tests which use NDK native tools must target API 19 at least
1 parent b5d2ded commit 0d98493

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
@@ -137,13 +137,17 @@ int GetNdkApiLevel (NdkTools ndk, AndroidTargetArch arch)
137137
int level;
138138
if (manifest?.MinSdkVersion != null) {
139139
level = manifest.MinSdkVersion.Value;
140+
Log.LogDebugMessage ($"NDK API level read from manifest");
140141
} else if (int.TryParse (MinimumSupportedApiLevel, out level)) {
142+
Log.LogDebugMessage ("NDK API level taken from MinimumSupportedApiLevel");
141143
// level already set
142144
} else if (int.TryParse (AndroidApiLevel, out level)) {
145+
Log.LogDebugMessage ("NDK API level taken from AndroidApiLevel");
143146
// level already set
144147
} else {
145148
// Probably not ideal!
146149
level = MonoAndroidHelper.SupportedVersions.MaxStableVersion.ApiLevel;
150+
Log.LogDebugMessage ("NDK API level taken from MonoAndroidHelper.SupportedVersions.MaxStableVersion.ApiLevel");
147151
}
148152

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

158162
// API levels below level 21 do not provide support for 64-bit architectures.
159163
if (ndk.IsNdk64BitArch (arch) && level < 21) {
164+
Log.LogDebugMessage ("NDK API level raised to 21, required for 64-bit support");
160165
level = 21;
161166
}
162167

@@ -172,6 +177,7 @@ int GetNdkApiLevel (NdkTools ndk, AndroidTargetArch arch)
172177
}
173178
}
174179

180+
Log.LogDebugMessage ($"Using NDK API level {level}");
175181
return level;
176182
}
177183

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)