From 27d1ecac0b117ccb0121ce8806ae932d2fbb26d5 Mon Sep 17 00:00:00 2001 From: Daco Harkes Date: Fri, 10 Nov 2023 12:35:23 +0000 Subject: [PATCH 1/2] Revert "[deps] Stop moving NDK folder inside Android SDK (#47454)" This reverts commit 5f246be25eba7506546b1cdadfc3615751ee229c. --- tools/android_sdk/create_cipd_packages.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/android_sdk/create_cipd_packages.sh b/tools/android_sdk/create_cipd_packages.sh index 4adcc2c96affa..2887cc1679f0f 100755 --- a/tools/android_sdk/create_cipd_packages.sh +++ b/tools/android_sdk/create_cipd_packages.sh @@ -115,6 +115,13 @@ 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" From 89d194ceb59383b35e27475fd4fbab428b846633 Mon Sep 17 00:00:00 2001 From: Daco Harkes Date: Fri, 10 Nov 2023 12:38:12 +0000 Subject: [PATCH 2/2] Add documentation --- tools/android_sdk/create_cipd_packages.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/android_sdk/create_cipd_packages.sh b/tools/android_sdk/create_cipd_packages.sh index 2887cc1679f0f..a4a2e8e4f9dee 100755 --- a/tools/android_sdk/create_cipd_packages.sh +++ b/tools/android_sdk/create_cipd_packages.sh @@ -116,6 +116,10 @@ for platform in "${platforms[@]}"; do done # Special treatment for NDK to move to expected directory. + # Instead of the ndk being in `sdk/ndk/../`, it will be + # in `ndk/`. + # This simplifies the build scripts, and enables version difference between + # the Dart and Flutter build while reusing the same build rules. 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)