Skip to content

Commit a33519c

Browse files
[ci] use $(Agent.TempDirectory)/android-sdk on all platforms (#1156)
I'm still setting the wrong Android SDK used on macOS in some cases: `C:\Android\android-sdk` Let's use `$(Agent.TempDirectory)/android-sdk`, even on Windows. Other changes: * Set `$AndroidSdkDirectory` env var in addition to `$ANDROID_SDK_ROOT` * See if full path fixes macOS install-android-dependencies.binlog * Run `-t:InstallAndroidDependencies` twice, once with the `Xamarin` manifest and once with `GoogleV2`.
1 parent 7087b1e commit a33519c

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

azure-pipelines-public.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ stages:
3939
vmImage: macOS-15
4040
runDotnetNextTest: ${{ parameters.RunDotnetNextTest }}
4141
use1ESTemplate: false
42-
androidSdkRoot: $(Agent.TempDirectory)/android-sdk
4342

4443
- template: build/ci/stage-standard-tests.yml@self
4544
parameters:

build/ci/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ parameters:
99
runDotnetNextTest: false
1010
use1ESTemplate: true
1111
installAndroidDependencies: false
12-
androidSdkRoot: C:\Android\android-sdk
12+
androidSdkRoot: $(Agent.TempDirectory)/android-sdk
1313

1414
tools: # Additional .NET global tools to install
1515
- 'Cake.Tool': '5.0.0'

build/ci/setup-environment.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ parameters:
22
dotnetTools: []
33
runDotnetNextTest: false
44
installAndroidDependencies: false
5-
androidSdkRoot: C:\Android\android-sdk
5+
androidSdkRoot: $(Agent.TempDirectory)/android-sdk
66
javaSdkRoot: $(Agent.ToolsDirectory)\jdk11
77

88
steps:
@@ -110,17 +110,29 @@ steps:
110110
jdkSourceOption: 'PreInstalled'
111111

112112
- task: DotNetCoreCLI@2
113-
displayName: Install android dependencies
113+
displayName: Install android dependencies GoogleV2
114114
inputs:
115115
command: build
116116
projects: build/scripts/provision-android/provision-android.csproj
117117
arguments: >-
118118
-t:InstallAndroidDependencies -p:AcceptAndroidSdkLicenses=true -p:AndroidManifestType=GoogleV2
119119
-p:AndroidSdkDirectory=${{ parameters.androidSdkRoot }}
120-
-v:n -bl:output/install-android-dependencies.binlog
120+
-v:n -bl:output/install-android-dependencies-GoogleV2.binlog
121+
retryCountOnTaskFailure: 3
122+
123+
- task: DotNetCoreCLI@2
124+
displayName: Install android dependencies Xamarin
125+
inputs:
126+
command: build
127+
projects: build/scripts/provision-android/provision-android.csproj
128+
arguments: >-
129+
-t:InstallAndroidDependencies -p:AcceptAndroidSdkLicenses=true -p:AndroidManifestType=Xamarin
130+
-p:AndroidSdkDirectory=${{ parameters.androidSdkRoot }}
131+
-v:n -bl:output/install-android-dependencies-Xamarin.binlog
121132
retryCountOnTaskFailure: 3
122133

123134
- pwsh: |
135+
Write-Host "##vso[task.setvariable variable=AndroidSdkDirectory]${{ parameters.androidSdkRoot }}"
124136
Write-Host "##vso[task.setvariable variable=ANDROID_SDK_ROOT]${{ parameters.androidSdkRoot }}"
125137
displayName: Set ANDROID_SDK_ROOT to ${{ parameters.androidSdkRoot }}
126138

0 commit comments

Comments
 (0)