Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[android-toolchain] Fix the location of the android tools #33

Merged
merged 1 commit into from
May 11, 2016

Conversation

dellis1972
Copy link
Contributor

@dellis1972 dellis1972 commented May 11, 2016

The current directory structure for the android sdk does NOT
match the one that google creates. The tools are not in a
tools subdirectory when they should be. As a result things like
the sdkmanager do not run. It also causes problems for Xamarin Studio
since its looking for things in different places.

This commit fixes up the tools .zip that we download to make sure
the tools are extacted to the correct directory. This is because
the new zip file contains the tools directory within it rather than
just being a flat zip file. Also it is the recommended tools download
from google [1]

[1] http://developer.android.com/sdk/index.html#mac-tools

@jonpryor
Copy link
Member

As per prior discussion, why use %(AndroidSdkItem.DestDir) instead of partially reverting commit eb76539 to use android-sdk_r24.4.1-macosx.zip instead of tools_r24.4.1-macosx.zip?

The advantages to android-sdk_r24.4.1-macosx.zip are:

  1. It's the recommended command line tools download file.
  2. It contains the appropriate internal structure to create the tools directory that you want anyway.

The current directory structure for the android sdk does NOT
match the one that google creates. The tools are not in a
tools subdirectory when they should be. As a result things like
the sdkmanager do not run. It also causes problems for Xamarin Studio
since its looking for things in different places.

This commit fixes up the tools .zip that we download to make sure
the tools are extacted to the correct directory. This is because
the new zip file contains the tools directory within it rather than
just being a flat zip file. Also it is the recommended tools download
from google [1]

[1] http://developer.android.com/sdk/index.html#mac-tools
@jonpryor jonpryor merged commit 42b1ec9 into dotnet:master May 11, 2016
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Jul 21, 2022
Changes: mono/opentk@50128f7...daa9b2d

  * mono/opentk@daa9b2d5: [nuget] use $(PackageLicenseExpression), not $(PackageLicenseUrl) (dotnet#35)
  * mono/opentk@351eb656: [ci] Use new EO compliant build pools (dotnet#33)
  * mono/opentk@95ab20b1: Try to fix DllNotFoundException under .net 6 (dotnet#32)
  * mono/opentk@3de39a40: Merge pull request dotnet#30 from dellis1972/proguard
  * mono/opentk@79ea8095: rework
  * mono/opentk@3311a8ac: Add Proguard config support
jonpryor added a commit to jonpryor/xamarin-android that referenced this pull request Jul 22, 2022
Changes: mono/opentk@50128f7...daa9b2d

  * mono/opentk@daa9b2d5: [nuget] use $(PackageLicenseExpression), not $(PackageLicenseUrl) (dotnet#35)
  * mono/opentk@351eb656: [ci] Use new EO compliant build pools (dotnet#33)
  * mono/opentk@95ab20b1: Try to fix DllNotFoundException under .net 6 (dotnet#32)
  * mono/opentk@3de39a40: Merge pull request dotnet#30 from dellis1972/proguard
  * mono/opentk@79ea8095: rework
  * mono/opentk@3311a8ac: Add Proguard config support
jonpryor added a commit that referenced this pull request Jul 26, 2022
Changes: mono/opentk@50128f7...daa9b2d

  * mono/opentk@daa9b2d5: [nuget] use $(PackageLicenseExpression), not $(PackageLicenseUrl) (#35)
  * mono/opentk@351eb656: [ci] Use new EO compliant build pools (#33)
  * mono/opentk@95ab20b1: Try to fix DllNotFoundException under .net 6 (#32)
  * mono/opentk@3de39a40: Merge pull request #30 from dellis1972/proguard
  * mono/opentk@79ea8095: rework
  * mono/opentk@3311a8ac: Add Proguard config support
@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