Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 5f246be

Browse files
authored
[deps] Stop moving NDK folder inside Android SDK (#47454)
One step in the direction of addressing * flutter/flutter#136666 I can't actually upload the packages: ` Instance registration failed: "user:[email protected]" has no required WRITER role in prefix`. I have verified locally that the directory structure is as expected by preventing the tmp folder from being deleted and browsing inside it. Old structure: * `sdk/` * `ndk/` New structure * `sdk/ndk/22.xxxx/` This PR does not yet update any of the DEPS anywhere yet, so we will need to do that after uploading new packages. Edit: new CIPD packages uploaded with: `~/flt/engine/src/flutter/tools/android_sdk$ ./create_cipd_packages.sh 33v6transitional2` (The script does now allow underscores in the tag.) [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent 0b6d9e1 commit 5f246be

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

tools/android_sdk/create_cipd_packages.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,6 @@ for platform in "${platforms[@]}"; do
115115
done
116116
done
117117

118-
# Special treatment for NDK to move to expected directory.
119-
mv $upload_dir/sdk/ndk $upload_dir/ndk-bundle
120-
ndk_sub_paths=`find $upload_dir/ndk-bundle -maxdepth 1 -type d`
121-
ndk_sub_paths_arr=($ndk_sub_paths)
122-
mv ${ndk_sub_paths_arr[1]} $upload_dir/ndk
123-
rm -rf $upload_dir/ndk-bundle
124-
125118
# Accept all licenses to ensure they are generated and uploaded.
126119
yes "y" | $sdkmanager_path --licenses --sdk_root=$sdk_root
127120
cp -r "$sdk_root/licenses" "$upload_dir/sdk"

0 commit comments

Comments
 (0)