Remove openssl dependency from android (#49282) (#50107)

Author: steveisok

docs/workflow/testing/libraries/testing-android.md

@@ -46,15 +46,6 @@ mkdir ${ANDROID_SDK_ROOT} && unzip ~/asdk.zip -d ${ANDROID_SDK_ROOT}/cmdline-too
 yes | ${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --licenses
 ${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "platforms;android-${SDK_API_LEVEL}" "build-tools;${SDK_BUILD_TOOLS}"
 
-# We also need to download precompiled binaries and headers for OpenSSL from maven, this step is a temporary hack
-# and will be removed once we figure out how to integrate OpenSSL properly as a dependency
-export ANDROID_OPENSSL_AAR=~/openssl-android
-curl https://maven.google.com/com/android/ndk/thirdparty/openssl/${OPENSSL_VER}/openssl-${OPENSSL_VER}.aar -L --output ~/openssl.zip
-unzip ~/openssl.zip -d ${ANDROID_OPENSSL_AAR} && rm -rf ~/openssl.zip
-printf "\n\nexport ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT}\nexport ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}\nexport ANDROID_OPENSSL_AAR=${ANDROID_OPENSSL_AAR}\n" >> ${BASHRC}
-```
-Save it to a file (e.g. `deps.sh`) and execute using `source` (e.g. `chmod +x deps.sh && source ./deps.sh`) in order to propogate the `ANDROID_NDK_ROOT`, `ANDROID_SDK_ROOT` and `ANDROID_OPENSSL_AAR` environment variables to the current process.
-
 ## Building Libs and Tests for Android
 
 Now we're ready to build everything for Android:

eng/install-native-dependencies.sh

@@ -46,19 +46,8 @@ elif [ "$1" = "OSX" ] || [ "$1" = "tvOS" ] || [ "$1" = "iOS" ]; then
     if [ "$?" != "0" ]; then
         exit 1;
     fi
-elif [ "$1" = "Android" ]; then
-    if [ -z "${ANDROID_OPENSSL_AAR}" ]; then
-        echo "The ANDROID_OPENSSL_AAR variable is not set. OpenSSL will not be installed."
-        exit 0;
-    fi
-    if [ -d "${ANDROID_OPENSSL_AAR}" ]; then
-        exit 0;
-    fi
-    OPENSSL_VER=1.1.1g-alpha-1
-    curl https://maven.google.com/com/android/ndk/thirdparty/openssl/${OPENSSL_VER}/openssl-${OPENSSL_VER}.aar -L --output /tmp/openssl.zip
-    unzip /tmp/openssl.zip -d "${ANDROID_OPENSSL_AAR}" && rm -rf /tmp/openssl.zip
 else
-    echo "Must pass \"Linux\", \"Android\", \"tvOS\", \"iOS\" or \"OSX\" as first argument."
+    echo "Must pass \"Linux\", \"tvOS\", \"iOS\" or \"OSX\" as first argument."
     exit 1
 fi
 

eng/pipelines/common/global-build-job.yml

@@ -86,10 +86,6 @@ jobs:
         ${{ if ne(parameters.enableRichCodeNavigation, true) }}:
           value: ''
 
-      - ${{ if eq(parameters.osGroup, 'Android') }}:
-        - name: ANDROID_OPENSSL_AAR
-          value: /tmp/openssl-android
-
       - ${{ each variable in parameters.variables }}:
         - ${{ variable }}
 
@@ -108,7 +104,7 @@ jobs:
           artifact: Mono_Offsets_${{monoCrossAOTTargetOS}}
           path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles'
 
-    - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}:
+    - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}:
       - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO
         displayName: Install Build Dependencies
 

eng/pipelines/runtime-staging.yml

@@ -64,6 +64,7 @@ jobs:
     buildConfig: Release
     runtimeFlavor: mono
     platforms:
+    - Android_x86
     - Android_x64
     - iOSSimulator_x64
     variables:
@@ -133,6 +134,17 @@ jobs:
             eq(variables['monoContainsChange'], true),
             eq(variables['isFullMatrix'], true))
 
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/common/global-build-job.yml
+    buildConfig: Release
+    platforms:
+    - Android_arm
+    jobParameters:
+      testGroup: innerloop
+      nameSuffix: Build_Subset_Mono
+      buildArgs: -subset mono+libs
+
 #
 # Build the whole product using Mono and run libraries tests
 #
@@ -252,34 +264,6 @@ jobs:
         creator: dotnet-bot
         testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 
-#
-# Build Mono and Libraries for Android using Android native crypto instead of OpenSSL
-#
-- template: /eng/pipelines/common/platform-matrix.yml
-  parameters:
-    jobTemplate: /eng/pipelines/common/global-build-job.yml
-    buildConfig: Release
-    runtimeFlavor: mono
-    platforms:
-    - Android_x64
-    - Android_x86
-    - Android_arm64
-    variables:
-      # disable using OpenSSL
-      - name: ANDROID_OPENSSL_AAR
-        value: ''
-      # map dependencies variables to local variables
-      - name: librariesContainsChange
-        value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
-    jobParameters:
-      nameSuffix: Libraries_Mono_AndroidCrypto
-      buildArgs: -s mono+libs -c $(_BuildConfig)
-      timeoutInMinutes: 180
-      condition: >-
-        or(
-          eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
-          eq(variables['isFullMatrix'], true))
-
 # Run disabled installer tests on Linux x64
 - template: /eng/pipelines/common/platform-matrix.yml
   parameters:

eng/pipelines/runtime.yml

@@ -222,7 +222,6 @@ jobs:
     buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
     runtimeFlavor: mono
     platforms:
-    - Android_x86
     - MacCatalyst_x64
     - MacCatalyst_arm64
     - tvOSSimulator_x64
@@ -246,7 +245,6 @@ jobs:
     buildConfig: Release
     runtimeFlavor: mono
     platforms:
-    - Android_arm
     - tvOS_arm64
     - iOS_arm
     - Linux_musl_x64

eng/testing/AndroidRunnerTemplate.sh

@@ -40,6 +40,7 @@ $HARNESS_RUNNER android test                \
     --package-name="net.dot.$ASSEMBLY_NAME" \
     --app="$EXECUTION_DIR/bin/$TEST_NAME.apk" \
     --output-directory="$XHARNESS_OUT" \
+    --timeout=1800 \
     $EXPECTED_EXIT_CODE
 
 _exitCode=$?

eng/testing/tests.mobile.targets

@@ -68,13 +68,6 @@
       </AotInputAssemblies>
     </ItemGroup>
 
-    <Copy Condition="'$(ANDROID_OPENSSL_AAR)' != ''"
-          SourceFiles="$(ANDROID_OPENSSL_AAR)\prefab\modules\crypto\libs\android.$(AndroidAbi)\libcrypto.so"
-          DestinationFolder="$(PublishDir)" SkipUnchangedFiles="true"/>
-    <Copy Condition="'$(ANDROID_OPENSSL_AAR)' != ''"
-          SourceFiles="$(ANDROID_OPENSSL_AAR)\prefab\modules\ssl\libs\android.$(AndroidAbi)\libssl.so"
-          DestinationFolder="$(PublishDir)" SkipUnchangedFiles="true"/>
-
     <WriteLinesToFile File="$(PublishDir)xunit-excludes.txt" Lines="$(XunitExcludesTxtFileContent)" />
 
     <MakeDir Directories="$(_MobileIntermediateOutputPath)" 

src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs

@@ -26,7 +26,7 @@ public static partial class PlatformDetection
         public static bool IsMonoInterpreter => GetIsRunningOnMonoInterpreter();
         public static bool IsFreeBSD => RuntimeInformation.IsOSPlatform(OSPlatform.Create("FREEBSD"));
         public static bool IsNetBSD => RuntimeInformation.IsOSPlatform(OSPlatform.Create("NETBSD"));
-        public static bool IsAndroid => RuntimeInformation.IsOSPlatform(OSPlatform.Create("Android"));
+        public static bool IsAndroid => RuntimeInformation.IsOSPlatform(OSPlatform.Create("ANDROID"));
         public static bool IsiOS => RuntimeInformation.IsOSPlatform(OSPlatform.Create("IOS"));
         public static bool IstvOS => RuntimeInformation.IsOSPlatform(OSPlatform.Create("TVOS"));
         public static bool IsMacCatalyst => RuntimeInformation.IsOSPlatform(OSPlatform.Create("MACCATALYST"));

src/libraries/Native/Unix/CMakeLists.txt

@@ -254,13 +254,8 @@ elseif(CLR_CMAKE_TARGET_TVOS)
     #add_subdirectory(System.Net.Security.Native) # no gssapi on tvOS, see https://developer.apple.com/documentation/gss
     # System.Security.Cryptography.Native is intentionally disabled on tvOS
     # it is only used for interacting with OpenSSL which isn't useful there
-elseif(CLR_CMAKE_TARGET_ANDROID AND NOT CROSS_ROOTFS)
-    #add_subdirectory(System.Net.Security.Native) # TODO: reenable
-    if (NOT "$ENV{ANDROID_OPENSSL_AAR}" STREQUAL "")
-        message("Using Android OpenSSL")
-        set(PREFER_OPENSSL_ANDROID 1)
-        add_subdirectory(System.Security.Cryptography.Native)
-    endif()
+elseif(CLR_CMAKE_TARGET_ANDROID)
+    add_subdirectory(System.Security.Cryptography.Native.Android)
 else()
     add_subdirectory(System.Globalization.Native)
     add_subdirectory(System.Net.Security.Native)
@@ -270,9 +265,3 @@ endif()
 if(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
     add_subdirectory(System.Security.Cryptography.Native.Apple)
 endif()
-
-# if ANDROID_OPENSSL_AAR is not set - use Android Native Crypto (it's going to replace openssl eventually)
-if(CLR_CMAKE_TARGET_ANDROID AND NOT PREFER_OPENSSL_ANDROID)
-    message("Using Android Native Crypto")
-    add_subdirectory(System.Security.Cryptography.Native.Android)
-endif()

src/libraries/Native/Unix/System.Security.Cryptography.Native/extra_libs.cmake

@@ -3,28 +3,9 @@ macro(append_extra_cryptography_libs NativeLibsExtra)
     if(CMAKE_STATIC_LIB_LINK)
        set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
     endif(CMAKE_STATIC_LIB_LINK)
-    
-    if(CLR_CMAKE_TARGET_ANDROID AND NOT CROSS_ROOTFS)
-        # TEMP: consume OpenSSL dependencies from external sources via env. variables
-        set(OPENSSL_FOUND 1)
-        set(OPENSSL_INCLUDE_DIR $ENV{ANDROID_OPENSSL_AAR}/prefab/modules/ssl/include)
-        if(CLR_CMAKE_TARGET_ARCH_ARM64)
-            set(OPENSSL_CRYPTO_LIBRARY $ENV{ANDROID_OPENSSL_AAR}/prefab/modules/crypto/libs/android.arm64-v8a/libcrypto.so)
-            set(OPENSSL_SSL_LIBRARY $ENV{ANDROID_OPENSSL_AAR}/prefab/modules/ssl/libs/android.arm64-v8a/libssl.so)
-        elseif(CLR_CMAKE_TARGET_ARCH_ARM)
-            set(OPENSSL_CRYPTO_LIBRARY $ENV{ANDROID_OPENSSL_AAR}/prefab/modules/crypto/libs/android.armeabi-v7a/libcrypto.so)
-            set(OPENSSL_SSL_LIBRARY $ENV{ANDROID_OPENSSL_AAR}/prefab/modules/ssl/libs/android.armeabi-v7a/libssl.so)
-        elseif(CLR_CMAKE_TARGET_ARCH_I386)
-            set(OPENSSL_CRYPTO_LIBRARY $ENV{ANDROID_OPENSSL_AAR}/prefab/modules/crypto/libs/android.x86/libcrypto.so)
-            set(OPENSSL_SSL_LIBRARY $ENV{ANDROID_OPENSSL_AAR}/prefab/modules/ssl/libs/android.x86/libssl.so)
-        else()
-            set(OPENSSL_CRYPTO_LIBRARY $ENV{ANDROID_OPENSSL_AAR}/prefab/modules/crypto/libs/android.x86_64/libcrypto.so)
-            set(OPENSSL_SSL_LIBRARY $ENV{ANDROID_OPENSSL_AAR}/prefab/modules/ssl/libs/android.x86_64/libssl.so)
-        endif()
-    else()
-        find_package(OpenSSL)
-    endif()
-    
+
+    find_package(OpenSSL)
+
     if(NOT OPENSSL_FOUND)
         message(FATAL_ERROR "!!! Cannot find libssl and System.Security.Cryptography.Native cannot build without it. Try installing libssl-dev (on Linux, but this may vary by distro) or openssl (on macOS) !!!. See the requirements document for your specific operating system: https://github.com/dotnet/runtime/tree/main/docs/workflow/requirements.")
     endif(NOT OPENSSL_FOUND)