Skip to content

Conversation

@dellis1972
Copy link
Contributor

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.

…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.
branch = master
[submodule "external/xamarin-android-tools"]
path = external/xamarin-android-tools
url = [email protected]:xamarin/xamarin-android-tools.git
Copy link
Contributor

Choose a reason for hiding this comment

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

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...?)

<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">
Copy link
Contributor

Choose a reason for hiding this comment

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

We should possibly follow suit with other external modules:

  1. In toplevel Configuration.props, add a $(XamarinAndroidToolsFullPath) MSBuild property (and others)

  2. 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.

<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Folder Include="Sdks\" />
<ProjectReference Include="..\..\external\xamarin-android-tools\src\Xamarin.Android.Tools\Xamarin.Android.Tools.csproj">
Copy link
Contributor

Choose a reason for hiding this comment

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

Ditto here with using $(XamarinAndroidToolsFullPath).

@jonpryor
Copy link
Contributor

Note that the PR build failed:

FATAL: Command "git submodule update --init --recursive" returned status code 1:
stdout: 
stderr: Cloning into '/Users/builder/jenkins/workspace/xamarin-android-pr-builder/xamarin-android/external/xamarin-android-tools'...
Permission denied (publickey).
fatal: Could not read from remote repository.

This is probably due to the use of the git@ URL for the submodule.

@jonpryor
Copy link
Contributor

build

@jonpryor
Copy link
Contributor

Superseded by PR #835.

@jonpryor jonpryor closed this Sep 12, 2017
radical pushed a commit that referenced this pull request May 8, 2018
Added them to the gendarme ignore list with an explanation.
@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