Skip to content

Conversation

@luhenry
Copy link
Contributor

@luhenry luhenry commented Aug 21, 2018

This reverts commit fef4541.

This brings back the responsibility of setting up the Android toolchain back into XA. This follows a discussion I has with @jonpryor, and during which we concluded we didn't want Mono to be responsible for that.

@luhenry luhenry requested a review from jonpryor as a code owner August 21, 2018 16:59
@luhenry luhenry force-pushed the mono-sdks-android-toolchain branch from ff70d09 to d15260b Compare August 21, 2018 18:19
Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it would work, I'll trigger some VSTS builds to verify. I think I can easily run them on a pool w/ fresh VMs, and that will tell us if the Android SDK installs.

@jonathanpeppers
Copy link
Member

@luhenry actually I think something got lost in this revert:

  /mnt/jenkins/workspace/xamarin-anroid-linux-pr-builder/xamarin-android/src/monodroid/monodroid.targets(49,5): error MSB3073: The command "/home/builder/android-toolchain/sdk/cmake/3.6.4111459/bin/cmake -GNinja -DMONO_PATH=/mnt/jenkins/workspace/xamarin-anroid-linux-pr-builder/xamarin-android/external/mono -DSGEN_BRIDGE_VERSION=5 -DCMAKE_MAKE_PROGRAM=/home/builder/android-toolchain/sdk/cmake/3.6.4111459/bin/ninja -DANDROID_TOOLCHAIN=clang -DANDROID_NATIVE_API_LEVEL=9 -DCMAKE_TOOLCHAIN_FILE=/home/builder/android-toolchain/ndk/build/cmake/android.toolchain.cmake -DANDROID_NDK=/home/builder/android-toolchain/ndk -DCONFIGURATION=Release -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=armeabi-v7a -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/mnt/jenkins/workspace/xamarin-anroid-linux-pr-builder/xamarin-android/bin/Debug/lib/xamarin.android/xbuild/Xamarin/Android/lib/armeabi-v7a /mnt/jenkins/workspace/xamarin-anroid-linux-pr-builder/xamarin-android/src/monodroid/" exited with code 127. [/mnt/jenkins/workspace/xamarin-anroid-linux-pr-builder/xamarin-android/src/monodroid/monodroid.csproj]

    4516 Warning(s)
    1 Error(s)

I think @grendello added cmake here, and this part isn't working.

@luhenry luhenry force-pushed the mono-sdks-android-toolchain branch from d15260b to 7a65176 Compare August 22, 2018 14:38
@luhenry
Copy link
Contributor Author

luhenry commented Aug 22, 2018

@grendello @jonathanpeppers it was just missing the cmake dependency at https://github.com/xamarin/xamarin-android/pull/2087/files#diff-537c65c49ec2131f809eb237923f0a15R79-R88.

On the same note, versions are different between external/mono/sdks/builds/android.mk and build-tools/android-toolchain/android-toolchain.projitems for various packages, so which one is the source of truth?

The main difference I can see is for emulator with emulator-{darwin,windows,linux}-4773671 in XA and emulator-{darwin,windows,linux}-4266726 in Mono.

@luhenry luhenry force-pushed the mono-sdks-android-toolchain branch 2 times, most recently from 89437cc to e315670 Compare August 22, 2018 14:46
@jonathanpeppers
Copy link
Member

@luhenry I think external/mono/sdks/builds/android.mk is the source of truth. The other one was likely only being used on Windows, since the build there can't run make.

But we should pick the higher number emulator 4773671 that should be fine. I bet we had a commit "updating" the emulator, but it wasn't really doing it.

@jonathanpeppers
Copy link
Member

build

@luhenry luhenry force-pushed the mono-sdks-android-toolchain branch from e315670 to 4894280 Compare August 24, 2018 02:48
@jonathanpeppers
Copy link
Member

Ok, this build looks good now (I would think the 1 failed unit test is a fluke).

Trying the VSTS builds on fresh VMs.

Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't test the Windows build yet, because the mono bundle will change. I can fix it if something breaks later on.

@dellis1972 can you review next week? looks good to me, since VSTS/Mac worked.

@luhenry luhenry merged commit d01e4ce into dotnet:master Aug 27, 2018
jonathanpeppers pushed a commit to jonathanpeppers/xamarin-android that referenced this pull request Sep 11, 2018
jonpryor pushed a commit to jonpryor/xamarin-android that referenced this pull request Sep 11, 2018
jonpryor added a commit that referenced this pull request Sep 11, 2018
Context: #2157

Merge commit; cherry-picks the following commits from master:

  * d01e4ce (PR #2087):
    Revert "[mono-sdks] Use for android toolchain"
  * 7c51a91 (PR #2119):
    [tests] Update emulator to the latest version, switch to API 28

We're hoping that the emulator update will make unit test execution
more reliable; see also PR #2157, which often has a crash when
running some unit tests.
@github-actions github-actions bot locked and limited conversation to collaborators Feb 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants