[Xamarin.Android.Build.utilities] Switch over to using the xamarin-android-tools repo for SDK resolution. [INPROGRESS] #241
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
…droid-tools repo for SDK resolution. We currently have duplicate code between Xamarin.Android and Xamarin Studio to resolve the Android Sdk/Ndk. This commit updates xamarin-android to use the new xamarin-android-tools repo for the SDK resolution. Xamarin Studio will also need to be updated to use the new common code base.
jonpryor
reviewed
Sep 29, 2016
| @@ -29,3 +29,6 @@ | |||
| path = external/llvm | |||
| url = https://github.com/mono/llvm.git | |||
| branch = master | |||
| [submodule "external/xamarin-android-tools"] | |||
| path = external/xamarin-android-tools | |||
| url = git@github.com:xamarin/xamarin-android-tools.git | |||
There was a problem hiding this comment.
This should be an https:// url, like the other submodules. Requiring git@ urls complicates checkouts for those who don't have GitHub accounts, iirc. (Or something like that...?)
jonpryor
reviewed
Sep 29, 2016
| @@ -643,6 +643,10 @@ | |||
| <Project>{E248B2CA-303B-4645-ADDC-9D4459D550FD}</Project> | |||
| <Name>libZipSharp</Name> | |||
| </ProjectReference> | |||
| <ProjectReference Include="..\..\external\xamarin-android-tools\src\Xamarin.Android.Tools\Xamarin.Android.Tools.csproj"> | |||
There was a problem hiding this comment.
We should possibly follow suit with other external modules:
-
In toplevel
Configuration.props, add a$(XamarinAndroidToolsFullPath)MSBuild property (and others) -
This line should then become:
<ProjectReference Include="$(XamarinAndroidToolsFullPath)\src\Xamarin.Android.Tools\Xamarin.Android.Tools.csproj">
This is so that the directory can be overridden.
jonpryor
reviewed
Sep 29, 2016
| <ItemGroup> | ||
| <Folder Include="Sdks\" /> | ||
| <ProjectReference Include="..\..\external\xamarin-android-tools\src\Xamarin.Android.Tools\Xamarin.Android.Tools.csproj"> |
There was a problem hiding this comment.
Ditto here with using $(XamarinAndroidToolsFullPath).
|
Note that the PR build failed: This is probably due to the use of the |
|
build |
|
Superseded by PR #835. |
radical
pushed a commit
that referenced
this pull request
May 8, 2018
Added them to the gendarme ignore list with an explanation.
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.
We currently have duplicate code between Xamarin.Android and Xamarin Studio
to resolve the Android Sdk/Ndk. This commit updates xamarin-android to use
the new xamarin-android-tools repo for the SDK resolution.
Xamarin Studio will also need to be updated to use the new common code
base.