Define ANDROID_OPENSSL_AAR

dotnet · Jun 8, 2020 · 4f54466 · 4f54466
1 parent 4e52da3
commit 4f54466
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml
@@ -61,7 +61,9 @@ jobs:
         - ${{ parameters.variables }}
         - ${{ if eq(parameters.osGroup, 'Browser') }}:
           - EMSDK_PATH: /usr/local/emscripten
-        # for coreclr library builds (when not testing) build corelib as well.   
+        - ${{ if eq(parameters.osGroup, 'Android') }}:
+          - ANDROID_OPENSSL_AAR: /tmp/openssl-android
+        # for coreclr library builds (when not testing) build corelib as well.
         - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.testScope, '')) }}:
           - _subset: clr.corelib+libs
         # Tests only run for 'allConfiguration' and 'net472' build-jobs
@@ -90,14 +92,14 @@ jobs:
                 $(_additionalBuildArguments)
           displayName: Restore and Build Product
 
-        - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: 
+        - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}:
           - script: |
               du -sh $(Build.SourcesDirectory)/*
               df -h
             displayName: Disk Usage after Build
 
         - ${{ if eq(parameters.runTests, false) }}:
-          - ${{ if ne(parameters.isOfficialBuild, true) }}:            
+          - ${{ if ne(parameters.isOfficialBuild, true) }}:
             - task: CopyFiles@2
               displayName: Prepare testhost folder to publish
               inputs:

diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj
@@ -63,7 +63,7 @@
     <HelixCommand>$(HelixCommand) /p:LocalPackagesPath="%HELIX_CORRELATION_PAYLOAD%\packages\"</HelixCommand>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(HelixCommand)' == ''">
+  <PropertyGroup Condition="'$(HelixCommand)' == '' and '$(TargetsMobile)' != 'true'">
     <HelixPreCommands Condition="'$(MonoEnvOptions)' != '' and '$(OSGroup)' == 'Windows_NT'">set MONO_ENV_OPTIONS='$(MonoEnvOptions)'</HelixPreCommands>
     <HelixPreCommands Condition="'$(MonoEnvOptions)' != '' and '$(OSGroup)' != 'Windows_NT'">export MONO_ENV_OPTIONS='$(MonoEnvOptions)'</HelixPreCommands>