Initial Android cross-compiler #43535

directhex · 2020-10-16T19:11:33Z

Only works on Mac due to --host= value (we must pass a --host triplet when we pass --target, and need to infer the correct one to use). This will cause CI failures until fixed, as we only build the runtime on Linux in CI.
Audit the configure flags, I sorta guessed based on gluing together the AOT flags from iOS/WASM and the JIT flags from Android
Less brute-force approach to not using the same CFLAGS etc for "real" runtime as cross-compiler. This was a fast way to filter out things I didn't want without breaking iOS etc, but it's not elegant and will cause problems in the future
Move AOT building to a new subset, so we can do AOT-only builds (i.e. avoid doing full builds on Mac/Windows)
Add Windows version (i.e. Windows builds with vcxproj, we need a cross-compiler vcxproj)
Add Yaml for all the runtime builds (maybe a new yaml, rather than runtime.yml?)

…K in the NewSFX subset.

…symbols package.

…es and packages

…nuget packaging projects.

…-unified-sharedfx

… from the runtime.

…d xml file.

This reverts commit 15cf3c0.

eng/pipelines/mono/templates/build-job.yml

src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj

src/mono/monoaotcross.proj

src/mono/mono.proj

src/mono/netcore/sample/Android/Makefile

src/mono/netcore/sample/iOS/Makefile

This reverts commit 0587cba.

directhex · 2021-01-14T16:32:05Z

Green with correct nupkgs on internal https://dev.azure.com/dnceng/internal/_build/results?buildId=950402&view=results

directhex · 2021-01-14T17:01:44Z

None of the remaining tests are related to stuff I've touched (and the one failure isn't my fault).

Anything more to add, @vargaz @safern @ViktorHofer @akoeplinger ?

akoeplinger

Looks great, left a couple comments but nothing that should hold off merging this :)

akoeplinger · 2021-01-14T19:34:34Z

eng/pipelines/mono/templates/build-job.yml

+        displayName: Download AOT offset files
+        inputs:
+          artifact: Mono_Offsets_Android
+          path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles'


do we still need this here if it's already in global-build-job.yml?

akoeplinger · 2021-01-14T19:35:32Z

eng/pipelines/runtime-official.yml

+      - OSX_x64
+      - Linux_x64
+      jobParameters:
+        buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)


do we really need the libs subset here?

akoeplinger · 2021-01-14T19:37:22Z

eng/pipelines/runtime-official.yml

+      jobTemplate: /eng/pipelines/mono/templates/generate-offsets.yml
+      buildConfig: release
+      platforms:
+      - Android_x64


maybe add a comment here that this will actually generate offsets for all platforms, not just x64.

akoeplinger · 2021-01-14T19:37:29Z

eng/pipelines/runtime.yml

+    jobTemplate: /eng/pipelines/mono/templates/generate-offsets.yml
+    buildConfig: release
+    platforms:
+    - Android_x64


same comment here

akoeplinger · 2021-01-14T19:37:49Z

eng/pipelines/runtime.yml

@@ -459,6 +475,34 @@ jobs:
          eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
          eq(variables['isFullMatrix'], true))

+#
+# Build Mono release Android AOT cross-compiler
+# Only when mono changed


Suggested change

# Only when mono changed

# Only when mono or installer changed

akoeplinger · 2021-01-14T19:40:25Z

src/mono/mono.proj

    <PropertyGroup>
-      <MonoLibClang Condition="'$(MonoLibClang)' == ''">$(XcodeDir)/Toolchains/XcodeDefault.xctoolchain/usr/lib/libclang.dylib</MonoLibClang>
+      <MonoLibClang Condition="$([MSBuild]::IsOSPlatform('OSX')) and '$(MonoLibClang)' == ''">$(XcodeDir)/Toolchains/XcodeDefault.xctoolchain/usr/lib/libclang.dylib</MonoLibClang>


we should probably use the libclang.dylib from the ANDROID_NDK_ROOT here too instead of the one from xcode.

jkoritzinsky and others added 30 commits June 23, 2020 17:12

Start creating runtime, apphost, and targeting packs using the new SD…

ba14e1d

…K in the NewSFX subset.

Fix generation of runtime package, runtime symbols package, and host …

6802ad1

…symbols package.

Correcly include hosting files and DIA in the shared framework archiv…

a36a296

…es and packages

Include PackageOverrides.txt in the ref pack.

c6f72c7

Fix product brand prefix.

8757c50

Add the shared host installer.

cbd46d2

Add the hostfxr build and clean up MacOS building.

db70570

Rename host and hostfxr projects to ensure we don't collide with the …

7ad7304

…nuget packaging projects.

Add bundle installer.

ece261c

Merge branch 'master' of https://github.com/dotnet/runtime into adopt…

84ab2b0

…-unified-sharedfx

Update platform manifest entries to include linux/mac file variations…

0b54120

… from the runtime.

Update apphost pack to match master.

290d0fa

Fix typo

2083c85

Include manpages and fix linux package properties.

49fbab6

Fix linux package properties.

0c9b00c

Match short-description from packages in master.

6dfa868

Update to uploaded package.

63cdc70

Update metadata and SDK to generate an exact match of the productbuil…

5c637d2

…d xml file.

First draft moving crossgen2 to new SDK.

c8bd51e

Get crossgen2 pack working with updated SDK.

890dc74

Merge remote-tracking branch 'dotnet/master' into adopt-unified-sharedfx

5ef903f

Build archives from the installer and bundle projects.

98bb6c9

Move the dotnet-runtime-deps installers to use the new SDK.

4a0ecf0

Rough attempt to convert the build to use the new sfx sdk.

3ac3696

Remove now empty subsets.

361e750

Update installer subsets for testing.

13753c6

Remove non-existent packaging project from subsets.

31fcde4

Add missing Windows api shim dll to platform manifest.

6683b7a

Update sharedfx sdk.

7137375

Add both versions of the long-name dac to the platform manifest.

f8d1fbe

directhex added 4 commits January 12, 2021 14:06

Missing args

9edf683

Add dependsOn to global-build-job

15cf3c0

Revert "Add dependsOn to global-build-job"

22bfc7f

This reverts commit 15cf3c0.

Use build-job directly, going via global-build-job is too hard

0587cba

safern reviewed Jan 12, 2021

View reviewed changes

eng/pipelines/mono/templates/build-job.yml Outdated Show resolved Hide resolved

ViktorHofer reviewed Jan 12, 2021

View reviewed changes

src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj Outdated Show resolved Hide resolved

ViktorHofer reviewed Jan 12, 2021

View reviewed changes

src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj Outdated Show resolved Hide resolved

ViktorHofer reviewed Jan 12, 2021

View reviewed changes

src/mono/monoaotcross.proj Outdated Show resolved Hide resolved

vargaz reviewed Jan 13, 2021

View reviewed changes

src/mono/mono.proj Show resolved Hide resolved

vargaz reviewed Jan 13, 2021

View reviewed changes

src/mono/netcore/sample/Android/Makefile Show resolved Hide resolved

vargaz reviewed Jan 13, 2021

View reviewed changes

src/mono/netcore/sample/iOS/Makefile Show resolved Hide resolved

directhex added 13 commits January 13, 2021 10:43

Revert "Use build-job directly, going via global-build-job is too hard"

014feb7

This reverts commit 0587cba.

Move artifact download to global-job, because reasons

e7e52c1

Pass through dependsOn in global-build-job

d9276e8

Merge remote-tracking branch 'origin/master' into android-cross

0e20a79

Changes from Zoltan

97b15bb

Changes from Zoltan

fa0ca33

changes from santi

098090e

Don't redefine

4da4b41

Better dependsOn

b0ce416

Typo

e719d36

More mess

af351ac

Merge remote-tracking branch 'origin/master' into android-cross

91d1179

Changes from Viktor

7b01293

akoeplinger approved these changes Jan 14, 2021

View reviewed changes

directhex merged commit 48f4f29 into dotnet:master Jan 14, 2021

akoeplinger mentioned this pull request Jan 15, 2021

mono-aot-cross built without any ELF build ID/MacO Id #47023

Closed

ghost locked as resolved and limited conversation to collaborators Feb 13, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial Android cross-compiler #43535

Initial Android cross-compiler #43535

directhex commented Oct 16, 2020 •

edited

Loading

directhex commented Jan 14, 2021

directhex commented Jan 14, 2021

akoeplinger left a comment

akoeplinger Jan 14, 2021

akoeplinger Jan 14, 2021

akoeplinger Jan 14, 2021

akoeplinger Jan 14, 2021

akoeplinger Jan 14, 2021

akoeplinger Jan 14, 2021

	# Only when mono changed
	# Only when mono or installer changed

Initial Android cross-compiler #43535

Initial Android cross-compiler #43535

Conversation

directhex commented Oct 16, 2020 • edited Loading

directhex commented Jan 14, 2021

directhex commented Jan 14, 2021

akoeplinger left a comment

Choose a reason for hiding this comment

akoeplinger Jan 14, 2021

Choose a reason for hiding this comment

akoeplinger Jan 14, 2021

Choose a reason for hiding this comment

akoeplinger Jan 14, 2021

Choose a reason for hiding this comment

akoeplinger Jan 14, 2021

Choose a reason for hiding this comment

akoeplinger Jan 14, 2021

Choose a reason for hiding this comment

akoeplinger Jan 14, 2021

Choose a reason for hiding this comment

directhex commented Oct 16, 2020 •

edited

Loading