Skip to content

Conversation

@jonpryor
Copy link
Contributor

Commit 6bb1016 "broke" build-tools/mono-runtimes, in that it didn't
build any Android target JIT ABIs, because it used the wrong MSBuild
property for the condition checks -- it used
$(AndroidSupportedTargetJitAbis), not
$(AndroidSupportedTargetJitAbisForConditionalChecks). Doh!

Fix that.

Additionally, src/monodroid needs to depend upon
build-tools/mono-runtimes because it depends upon eglib-config.h,
which is generated as part of the mono build. src/monodroid doens't
depend upon the generated libmonosgen-2.0.so file, but it does
depend upon the build tree.

Commit 6bb1016 "broke" `build-tools/mono-runtimes`, in that it didn't
build any Android target JIT ABIs, because it used the wrong MSBuild
property for the condition checks -- it used
`$(AndroidSupportedTargetJitAbis)`, not
`$(AndroidSupportedTargetJitAbisForConditionalChecks)`. Doh!

Fix that.

Additionally, `src/monodroid` needs to depend upon
`build-tools/mono-runtimes` because it depends upon eglib-config.h,
which is generated as part of the mono build. `src/monodroid` doens't
depend upon the generated `libmonosgen-2.0.so` file, but it *does*
depend upon the build tree.
@grendello grendello merged commit 7a04ea5 into dotnet:master Jun 15, 2016
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Apr 30, 2020
Changes: dotnet/android-tools@12f52ac...f5fcb9f

  * dotnet/android-tools@f5fcb9f: [Xamarin.Android.Tools.AndroidSdk] Add support for cmdline-tools (dotnet#83)
  * dotnet/android-tools@f473ff9: [AndroidSdkWindows] Guard against exception checking registry (dotnet#79)
  * dotnet/android-tools@36d7fee: JetBrains OpenJDK 11 detection (dotnet#82)
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request May 7, 2020
Changes: dotnet/android-tools@12f52ac...f5fcb9f

  * dotnet/android-tools@f5fcb9f: [Xamarin.Android.Tools.AndroidSdk] Add support for cmdline-tools (dotnet#83)
  * dotnet/android-tools@f473ff9: [AndroidSdkWindows] Guard against exception checking registry (dotnet#79)
  * dotnet/android-tools@36d7fee: JetBrains OpenJDK 11 detection (dotnet#82)
jonpryor added a commit that referenced this pull request May 7, 2020
Changes: dotnet/android-tools@12f52ac...f5fcb9f

  * dotnet/android-tools@f5fcb9f: [Xamarin.Android.Tools.AndroidSdk] Add support for cmdline-tools (#83)
  * dotnet/android-tools@f473ff9: [AndroidSdkWindows] Guard against exception checking registry (#79)
  * dotnet/android-tools@36d7fee: JetBrains OpenJDK 11 detection (#82)
jonpryor added a commit that referenced this pull request May 8, 2020
Changes: dotnet/android-tools@12f52ac...23c4fe0

  * dotnet/android-tools@23c4fe0: [Xamarin.Android.Tools.AndroidSdk] Add support for cmdline-tools (#83)
  * dotnet/android-tools@cf9d325: [AndroidSdkWindows] Guard against exception checking registry (#79)
  * dotnet/android-tools@310c5cf: JetBrains OpenJDK 11 detection (#82)
@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