From 2874233c1f139f8b89360f0ca1e013ad4fa40267 Mon Sep 17 00:00:00 2001 From: Daco Harkes Date: Mon, 30 Oct 2023 10:58:00 +0000 Subject: [PATCH] [deps] Stop moving NDK folder inside Android SDK --- tools/android_sdk/create_cipd_packages.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/android_sdk/create_cipd_packages.sh b/tools/android_sdk/create_cipd_packages.sh index 2887cc1679f0f..4adcc2c96affa 100755 --- a/tools/android_sdk/create_cipd_packages.sh +++ b/tools/android_sdk/create_cipd_packages.sh @@ -115,13 +115,6 @@ for platform in "${platforms[@]}"; do done done - # Special treatment for NDK to move to expected directory. - mv $upload_dir/sdk/ndk $upload_dir/ndk-bundle - ndk_sub_paths=`find $upload_dir/ndk-bundle -maxdepth 1 -type d` - ndk_sub_paths_arr=($ndk_sub_paths) - mv ${ndk_sub_paths_arr[1]} $upload_dir/ndk - rm -rf $upload_dir/ndk-bundle - # Accept all licenses to ensure they are generated and uploaded. yes "y" | $sdkmanager_path --licenses --sdk_root=$sdk_root cp -r "$sdk_root/licenses" "$upload_dir/sdk"