Merge pull request #3194 from modocache/android-deploy-path-default

[Android] Specify default device deploy path

Author: modocache

docs/Android.md

@@ -198,7 +198,6 @@ $ utils/build-script \
   -R \                                           # Build in ReleaseAssert mode.
   -T \                                           # Run all tests.
   --android \                                    # Build for Android.
-  --android-deploy-device-path /data/local/tmp \ # Temporary directory on the device where Android tests are run.
   --android-ndk ~/android-ndk-r12 \              # Path to an Android NDK.
   --android-ndk-version 21 \
   --android-icu-uc ~/libicu-android/armeabi-v7a/libicuuc.so \

test/CMakeLists.txt

@@ -205,6 +205,12 @@ if(PYTHONINTERP_FOUND)
         # These are supported testing SDKs, but their implementation of
         # `command_upload_stdlib` is hidden.
       elseif("${SDK}" STREQUAL "ANDROID")
+        if("${SWIFT_ANDROID_DEPLOY_DEVICE_PATH}" STREQUAL "")
+          message(FATAL_ERROR
+              "When running Android host tests, you must specify the directory on the device "
+              "to which Swift build products will be deployed.")
+        endif()
+
         # Warning: This step will fail if you do not have an Android device
         #          connected via USB. See docs/Android.md for details on
         #          how to run the test suite for Android.

utils/build-script

@@ -1773,6 +1773,7 @@ details of the setups of other systems or automated environments.""")
         help="Path on an Android device to which built Swift stdlib products "
              "will be deployed. If running host tests, specify the '{}' "
              "directory.".format(adb.commands.DEVICE_TEMP_DIR),
+        default=adb.commands.DEVICE_TEMP_DIR,
         metavar="PATH")
 
     parser.add_argument(