Reapply "[native] Real shared libraries in APK /lib directories (#9154)" #9348
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jonathanpeppers
added
the
use-rebase-and-merge
jonathanpeppers
requested review from
dellis1972,
grendello and
jonpryor
as code owners
dellis1972
approved these changes
Sep 30, 2024
|
Looks good so far!
|
grendello
approved these changes
Sep 30, 2024
)" This reverts commit b795a65.
Context: https://aka.ms/onelocbuild Context: https://aka.ms/AllAboutLoc Build definition ID 17928: Build ID 10293307
…<PrepareDSOWrapperState/>` (#9340) Context: dotnet/maui#24539 (comment) In .NET MAUI's build, they failed to bump .NET for Android because of the following error: dotnet\packs\Microsoft.Android.Sdk.Windows\35.0.0-rc.2.130\tools\Xamarin.Android.Common.Debugging.targets(139,2): error XABLD7009: System.InvalidOperationException: Internal error: archive DSO stub location not known for architecture 'X86' at Xamarin.Android.Tasks.DSOWrapperGenerator.WrapIt(AndroidTargetArch targetArch, String payloadFilePath, String outputFileName, IBuildEngine4 buildEngine, TaskLoggingHelper log) in /Users/runner/work/1/s/xamarin-android/src/Xamarin.Android.Build.Tasks/Utilities/DSOWrapperGenerator.cs:line 86 at Xamarin.Android.Tasks.BuildApk.AddRuntimeConfigBlob(ZipArchiveEx apk) in /Users/runner/work/1/s/xamarin-android/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs:line 404 at Xamarin.Android.Tasks.BuildApk.ExecuteWithAbi(String[] supportedAbis, String apkInputPath, String apkOutputPath, Boolean debug, Boolean compress, IDictionary`2 compressedAssembliesInfo, String assemblyStoreApkName) in /Users/runner/work/1/s/xamarin-android/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs:line 215 at Xamarin.Android.Tasks.BuildApk.RunTask() in /Users/runner/work/1/s/xamarin-android/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs:line 357 at Microsoft.Android.Build.Tasks.AndroidTask.Execute() in /Users/runner/work/1/s/xamarin-android/external/xamarin-android-tools/src/Microsoft.Android.Build.BaseTasks/AndroidTask.cs:line 25 In 5ebcb1d, we introduced some MSBuild `RegisterTaskObject()` usage that failed in specific way: * MAUI has a `.sln` with multiple "app" projects: device tests, samples, etc. building in parallel * The `<PrepareDSOWrapperState/>` MSBuild task runs for project A, saving x64 and arm64 values. * Project B goes to run `<BuildApk/>` but x86 is missing. For now, we can fix this by using `ProjectSpecificTaskObjectKey()` that wraps the key with a `Tuple` such as: (key, WorkingDirectory) Which, should result in a unique key per project. In a future PR, we could consider removing this `RegisterTaskObject()` usage completely, and doing all the work inside the `<BuildApk/>` MSBuild task instead.
jonathanpeppers
force-pushed
the
dev/restore/9154
branch
from
d5070cf
to
65a4c8b
Compare
|
Latest changes, I just fixed up the |
|
Test failures look ok:
|
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use
rebase-and-mergeto merge this, so we get 3 commits.MAUI Test Integrationshould hopefully pass to know MAUI will build after merging.