Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Native call tracing infrastructure + native build system overhaul #8857

Merged
merged 36 commits into from
May 16, 2024
Merged

Native call tracing infrastructure + native build system overhaul #8857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
564f130
Begin migration from https://github.com/xamarin/xamarin-android/pull/…
grendello Apr 4, 2024
8554fed
Bumps LLVM to v18.1.3 and XA utils version to 8.0.0 (#8852)
grendello Apr 5, 2024
42e199a
Bump external/Java.Interop from `651de42` to `e1c7832` (#8836)
dependabot[bot] Apr 8, 2024
b9b0571
[ci] Update dependabot ignore list (#8864)
pjcollins Apr 9, 2024
e085755
Merge branch 'main' into dev/grendel/native-tracing
grendello Apr 10, 2024
842d3c3
Update apkdesc files
grendello Apr 11, 2024
9cf8516
[WIP] Migration to new native sources layout
grendello Apr 11, 2024
7ad1a7a
Merge branch 'main' into dev/grendel/native-tracing
grendello Apr 12, 2024
37c2108
[WIP] xaprepare generates cmake presets
grendello Apr 12, 2024
eb0628f
[WIP] cmake stuff
grendello Apr 12, 2024
5756ecd
Refactoring + cleanup continue
grendello Apr 15, 2024
8355440
Merge branch 'main' into dev/grendel/native-tracing
grendello Apr 16, 2024
d6ba624
Most libs are built from separate directories now
grendello Apr 16, 2024
ccfe36e
All libraries are built in their own directories
grendello Apr 16, 2024
c45283b
Should fully build now
grendello Apr 17, 2024
4a317bb
A few more build tweaks, mostly for analyzer builds
grendello Apr 17, 2024
8de9732
Merge branch 'main' into dev/grendel/native-tracing
grendello Apr 18, 2024
f09a839
Update apkdesc files
grendello Apr 18, 2024
fe32008
Fix a handful of tests, plus...
grendello Apr 19, 2024
ce05433
Don't put the native tracing library in apk by default
grendello Apr 22, 2024
ec09869
Update apkdesc + use anonymous namespace
grendello Apr 22, 2024
e4a8eff
Update policheck/source.gdnsuppress
pjcollins Apr 22, 2024
e1c3c8f
Drop use of some macros
grendello Apr 22, 2024
8986fc2
Cleanup
grendello Apr 22, 2024
ff9b068
Merge branch 'main' into dev/grendel/native-tracing
grendello Apr 23, 2024
48cb44d
Hopefully final cleanup steps
grendello Apr 23, 2024
506d175
Merge branch 'main' into dev/grendel/native-tracing
grendello Apr 23, 2024
13e63bd
Merge branch 'main' into dev/grendel/native-tracing
grendello Apr 24, 2024
ece8a68
Remove unneded include dirs
grendello Apr 24, 2024
c9e5ebd
Merge branch 'main' into dev/grendel/native-tracing
grendello Apr 24, 2024
8df0ef2
Merge branch 'main' into dev/grendel/native-tracing
grendello Apr 25, 2024
8f75b0c
Merge branch 'main' into dev/grendel/native-tracing
grendello May 7, 2024
23fde10
Merge branch 'main' into dev/grendel/native-tracing
grendello May 13, 2024
4086a74
Merge branch 'main' into dev/grendel/native-tracing
grendello May 14, 2024
ed74cfc
Address feedback
grendello May 15, 2024
ad9a506
Merge branch 'main' into dev/grendel/native-tracing
grendello May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .gdn/policheck/source.gdnsuppress
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"default": {
"name": "default",
"createdDate": "2023-02-22 23:55:29Z",
"lastUpdatedDate": "2024-02-22 21:40:38Z"
"lastUpdatedDate": "2024-04-22 13:40:30Z"
}
},
"results": {
Expand Down Expand Up @@ -101,43 +101,43 @@
"justification": "Reference to an Android logging function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"a2b4d032c59a9d1211d218c3cd550cf8febb369941d70284d07d03ebee855bc0": {
"signature": "a2b4d032c59a9d1211d218c3cd550cf8febb369941d70284d07d03ebee855bc0",
"bca629d8e7888af4116b013c6585b78d0908d248a80138339e0eb1620832eb10": {
"signature": "bca629d8e7888af4116b013c6585b78d0908d248a80138339e0eb1620832eb10",
"alternativeSignatures": [
"9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
"f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
],
"memberOf": [
"default"
],
"justification": "Reference to find first set bit function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"1c87b45a6044d205dc3f3562f349c238f7cabe22b4609da762df9dc44151e9fb": {
"signature": "1c87b45a6044d205dc3f3562f349c238f7cabe22b4609da762df9dc44151e9fb",
"dc43990fd9fa6a44f2fb2fffcb0497571af4379f23090482035d79a98970e7ae": {
"signature": "dc43990fd9fa6a44f2fb2fffcb0497571af4379f23090482035d79a98970e7ae",
"alternativeSignatures": [
"9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
"f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
],
"memberOf": [
"default"
],
"justification": "Reference to find first set bit function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"a6639098c4785509a4215c9e2fc10f82c06fce461915dc11a00227ddec558845": {
"signature": "a6639098c4785509a4215c9e2fc10f82c06fce461915dc11a00227ddec558845",
"eb60d4f1e48ca85ad5fa4a413d8ff76c4975bccb12931f51179d67c24a82f354": {
"signature": "eb60d4f1e48ca85ad5fa4a413d8ff76c4975bccb12931f51179d67c24a82f354",
"alternativeSignatures": [
"9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
"f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
],
"memberOf": [
"default"
],
"justification": "Reference to find first set bit function.",
"createdDate": "2023-02-22 23:55:29Z"
},
"f94ede7b396cb54934db2084f0879cd31a17ce2584eb01e0bfcd35324a724c31": {
"signature": "f94ede7b396cb54934db2084f0879cd31a17ce2584eb01e0bfcd35324a724c31",
"bb80a900ad96e4833eb7f54f55723a3425e846a290dd62b709d4714952cd9d45": {
"signature": "bb80a900ad96e4833eb7f54f55723a3425e846a290dd62b709d4714952cd9d45",
"alternativeSignatures": [
"9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
"f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
],
"memberOf": [
"default"
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@
[submodule "external/constexpr-xxh3"]
path = external/constexpr-xxh3
url = https://github.com/chys87/constexpr-xxh3.git
[submodule "external/libunwind"]
path = external/libunwind
url = https://github.com/libunwind/libunwind.git
branch = master
6 changes: 6 additions & 0 deletions Configuration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
<IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
<OpenTKSourceDirectory>$(MSBuildThisFileDirectory)external\opentk</OpenTKSourceDirectory>
<SqliteSourceDirectory Condition=" '$(SqliteSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\sqlite</SqliteSourceDirectory>
<LibUnwindSourceDirectory Condition=" '$(LibUnwindSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\libunwind</LibUnwindSourceDirectory>
<LibUnwindGeneratedHeadersDirectory Condition=" '$(LibUnwindGeneratedHeadersDirectory)' == '' ">$(BootstrapOutputDirectory)\libunwind</LibUnwindGeneratedHeadersDirectory>
<LZ4SourceDirectory Condition=" '$(LZ4SourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\lz4</LZ4SourceDirectory>
<XamarinAndroidSourcePath>$(MSBuildThisFileDirectory)</XamarinAndroidSourcePath>
<ThirdPartySourcePath>$(MSBuildThisFileDirectory)src-ThirdParty\</ThirdPartySourcePath>
<AllSupported32BitTargetAndroidAbis>armeabi-v7a;x86</AllSupported32BitTargetAndroidAbis>
Expand Down Expand Up @@ -144,6 +147,9 @@
<JavaInteropFullPath>$([System.IO.Path]::GetFullPath ('$(JavaInteropSourceDirectory)'))</JavaInteropFullPath>
<MonoSourceFullPath>$([System.IO.Path]::GetFullPath ('$(MonoSourceDirectory)'))</MonoSourceFullPath>
<SqliteSourceFullPath>$([System.IO.Path]::GetFullPath ('$(SqliteSourceDirectory)'))</SqliteSourceFullPath>
<LibUnwindSourceFullPath>$([System.IO.Path]::GetFullPath ('$(LibUnwindSourceDirectory)'))</LibUnwindSourceFullPath>
<LibUnwindGeneratedHeadersFullPath>$([System.IO.Path]::GetFullPath ('$(LibUnwindGeneratedHeadersDirectory)'))</LibUnwindGeneratedHeadersFullPath>
<LZ4SourceFullPath>$([System.IO.Path]::GetFullPath ('$(LZ4SourceDirectory)'))</LZ4SourceFullPath>
<OpenTKSourceFullPath>$([System.IO.Path]::GetFullPath ('$(OpenTKSourceDirectory)'))</OpenTKSourceFullPath>
<JavaInteropTargetFrameworkVersion>net8.0</JavaInteropTargetFrameworkVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Android.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.Diagnost
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.Cecil", "external\Java.Interop\src\Java.Interop.Tools.Cecil\Java.Interop.Tools.Cecil.csproj", "{D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "monodroid", "src\monodroid\monodroid.csproj", "{53EE4C57-1C03-405A-8243-8DA539546C88}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "native", "src\native\native.csproj", "{53EE4C57-1C03-405A-8243-8DA539546C88}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}"
EndProject
Expand Down
1 change: 0 additions & 1 deletion build-tools/cmake/xa_common.cmake
View file
Open in desktop

This file was deleted.

Loading
Loading