Merge NDK and licenses into Android dependencies script

DEPS

@@ -478,17 +478,6 @@ deps = {
     'dep_type': 'cipd'
   },
 
-  'src/third_party/android_tools/ndk': {
-     'packages': [
-       {
-        'package': 'flutter/android/ndk/${{platform}}',
-        'version': 'version:r22.0.7026061'
-       }
-     ],
-     'condition': 'download_android_deps',
-     'dep_type': 'cipd',
-   },
-
    'src/third_party/android_tools/google-java-format': {
      'packages': [
        {
@@ -503,28 +492,17 @@ deps = {
      'dep_type': 'cipd',
    },
 
-  'src/third_party/android_tools/sdk': {
+  'src/third_party/android_tools': {
      'packages': [
        {
         'package': 'flutter/android/sdk/all/${{platform}}',
-        'version': 'version:31v5'
+        'version': 'version:31v8'
        }
      ],
      'condition': 'download_android_deps',
      'dep_type': 'cipd',
    },
 
-  'src/third_party/android_tools/sdk/licenses': {
-     'packages': [
-       {
-        'package': 'flutter/android/sdk/licenses',
-        'version': 'latest',
-       }
-     ],
-    'condition': 'download_android_deps',
-    'dep_type': 'cipd',
-  },
-
   'src/third_party/android_embedding_dependencies': {
      'packages': [
        {

tools/android_sdk/create_sdk_cipd_packages.sh → tools/android_sdk/create_cipd_packages.sh

@@ -3,7 +3,7 @@
 # This script requires depot_tools to be on path.
 
 print_usage () {
-  echo "Usage: create_sdk_cipd_united_package.sh <VERSION_TAG> [PATH_TO_SDK_DIR]"
+  echo "Usage: create_cipd_united_package.sh <VERSION_TAG> [PATH_TO_SDK_DIR]"
   echo "  where:"
   echo "    - VERSION_TAG is the tag of the cipd packages, e.g. 28r6 or 31v1"
   echo "    - PATH_TO_SDK_DIR is the path to the sdk folder. If omitted, this defaults to"
@@ -76,10 +76,11 @@ temp_dir=`mktemp -d -t android_sdk`
 
 for platform in "${platforms[@]}"; do
   sdk_root="$temp_dir/sdk_$platform"
-  upload_dir="$sdk_root/upload"
+  upload_dir="$temp_dir/upload_$platform"
   echo "Creating temporary working directory for $platform: $sdk_root"
   mkdir $sdk_root
   mkdir $upload_dir
+  mkdir $upload_dir/sdk
   export REPO_OS_OVERRIDE=$platform
 
   # Download all the packages with sdkmanager.
@@ -93,10 +94,18 @@ for platform in "${platforms[@]}"; do
     # for upload. sdkmanager creates extra files that we don't need.
     array_length=${#split[@]}
     for (( i=1; i<${array_length}; i++ )); do
-      cp -r "$sdk_root/${split[$i]}" "$upload_dir"
+      cp -r "$sdk_root/${split[$i]}" "$upload_dir/sdk"
     done
   done
 
+  # Special treatment for NDK to move to expected directory.
+  mv $upload_dir/sdk/ndk-bundle $upload_dir
+  mv $upload_dir/ndk-bundle $upload_dir/ndk
+
+  # 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"
+
   # Mac uses a different sdkmanager name than the platform name used in gn.
   cipd_name="$platform-amd64"
   if [[ $platform == "macosx" ]]; then
@@ -106,5 +115,6 @@ for platform in "${platforms[@]}"; do
   cipd create -in $upload_dir -name "flutter/android/sdk/all/$cipd_name" -install-mode copy -tag version:$version_tag
 
   rm -rf $sdk_root
+  rm -rf $upload_dir
 done
 rm -rf $temp_dir

tools/android_sdk/packages.txt

@@ -2,4 +2,5 @@ platforms;android-31:platforms
 cmdline-tools;latest:cmdline-tools
 build-tools;31.0.0:build-tools
 platform-tools:platform-tools
-tools:tools
+tools:tools
+ndk-bundle:ndk-bundle