Switch to unified public android sdk cipd
Change-Id: I6461d0cdfaa58298fd0cdbb0b09dd15e960c6d87
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/27020
Reviewed-by: Emmanuel Garcia <egarciad@google.com>
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
Commit-Queue: Gary Qian <garyq@google.com>
diff --git a/recipe_modules/flutter_deps/api.py b/recipe_modules/flutter_deps/api.py
index f5a1336..cdd5cd8 100644
--- a/recipe_modules/flutter_deps/api.py
+++ b/recipe_modules/flutter_deps/api.py
@@ -229,13 +229,23 @@
def android_sdk(self, env, env_prefixes, version):
"""Installs android sdk."""
version = version or 'latest'
- android_sdk_path = self.m.path['cache'].join('android')
- android_sdk = self.m.cipd.EnsureFile()
- android_sdk.add_package('flutter_internal/android/sdk/${platform}', version)
- self.m.cipd.ensure(android_sdk_path, android_sdk)
+ sdk_root = self.m.path['cache'].join('android')
+ self.m.cipd.ensure(
+ sdk_root,
+ self.m.cipd.EnsureFile().add_package(
+ 'flutter/android/sdk/all/${platform}',
+ version,
+ ),
+ )
# Setup environment variables
- env['ANDROID_SDK_ROOT'] = android_sdk_path
- env['ANDROID_HOME'] = android_sdk_path
+ if (version == 'version:29.0'): # Handle the legacy case
+ env['ANDROID_SDK_ROOT'] = sdk_root
+ env['ANDROID_HOME'] = sdk_root
+ env['ANDROID_NDK_PATH'] = sdk_root.join('ndk-bundle')
+ else:
+ env['ANDROID_SDK_ROOT'] = sdk_root.join('sdk')
+ env['ANDROID_HOME'] = sdk_root.join('sdk')
+ env['ANDROID_NDK_PATH'] = sdk_root.join('ndk')
self.gradle_cache(env, env_prefixes, version)
def gradle_cache(self, env, env_prefixes, version):
diff --git a/recipe_modules/flutter_deps/examples/full.expected/basic.json b/recipe_modules/flutter_deps/examples/full.expected/basic.json
index 35b73b8..7243bf2 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/basic.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/basic.json
@@ -273,7 +273,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -286,7 +286,35 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "ensure",
+ "-root",
+ "[CACHE]/android",
+ "-ensure-file",
+ "flutter/android/sdk/all/${platform} version:29.0",
+ "-max-threads",
+ "0",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_installed (5)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:29.0----\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -464,7 +492,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "ensure_installed (5)",
+ "name": "ensure_installed (6)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
@@ -586,6 +614,7 @@
"cwd": "[CACHE]/avd",
"env": {
"ANDROID_HOME": "[CACHE]/android",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
"ANDROID_SDK_ROOT": "[CACHE]/android",
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
"CHROME_NO_SANDBOX": "true",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json b/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
index 1a58c10..22a543e 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
@@ -273,7 +273,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -286,7 +286,35 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "ensure",
+ "-root",
+ "[CACHE]/android",
+ "-ensure-file",
+ "flutter/android/sdk/all/${platform} version:29.0",
+ "-max-threads",
+ "0",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_installed (5)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:29.0----\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -548,7 +576,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "ensure_installed (5)",
+ "name": "ensure_installed (6)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
@@ -670,6 +698,7 @@
"cwd": "[CACHE]/avd",
"env": {
"ANDROID_HOME": "[CACHE]/android",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
"ANDROID_SDK_ROOT": "[CACHE]/android",
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
"CHROME_NO_SANDBOX": "true",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json b/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
index 35b73b8..7243bf2 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
@@ -273,7 +273,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -286,7 +286,35 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "ensure",
+ "-root",
+ "[CACHE]/android",
+ "-ensure-file",
+ "flutter/android/sdk/all/${platform} version:29.0",
+ "-max-threads",
+ "0",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_installed (5)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:29.0----\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -464,7 +492,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "ensure_installed (5)",
+ "name": "ensure_installed (6)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
@@ -586,6 +614,7 @@
"cwd": "[CACHE]/avd",
"env": {
"ANDROID_HOME": "[CACHE]/android",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
"ANDROID_SDK_ROOT": "[CACHE]/android",
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
"CHROME_NO_SANDBOX": "true",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/linux.json b/recipe_modules/flutter_deps/examples/full.expected/linux.json
index 35b73b8..7243bf2 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/linux.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/linux.json
@@ -273,7 +273,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -286,7 +286,35 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "ensure",
+ "-root",
+ "[CACHE]/android",
+ "-ensure-file",
+ "flutter/android/sdk/all/${platform} version:29.0",
+ "-max-threads",
+ "0",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_installed (5)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:29.0----\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -464,7 +492,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "ensure_installed (5)",
+ "name": "ensure_installed (6)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
@@ -586,6 +614,7 @@
"cwd": "[CACHE]/avd",
"env": {
"ANDROID_HOME": "[CACHE]/android",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
"ANDROID_SDK_ROOT": "[CACHE]/android",
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
"CHROME_NO_SANDBOX": "true",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json b/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
index aec57cd..00e4787 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
@@ -273,7 +273,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -286,7 +286,35 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "ensure",
+ "-root",
+ "[CACHE]/android",
+ "-ensure-file",
+ "flutter/android/sdk/all/${platform} version:29.0",
+ "-max-threads",
+ "0",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_installed (5)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:29.0----\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -548,7 +576,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "ensure_installed (5)",
+ "name": "ensure_installed (6)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
@@ -670,6 +698,7 @@
"cwd": "[CACHE]/avd",
"env": {
"ANDROID_HOME": "[CACHE]/android",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
"ANDROID_SDK_ROOT": "[CACHE]/android",
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
"CHROME_NO_SANDBOX": "true",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac.json b/recipe_modules/flutter_deps/examples/full.expected/mac.json
index de0f518..296f030 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac.json
@@ -335,7 +335,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -348,7 +348,35 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "ensure",
+ "-root",
+ "[CACHE]/android",
+ "-ensure-file",
+ "flutter/android/sdk/all/${platform} version:29.0",
+ "-max-threads",
+ "0",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_installed (5)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:29.0----\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -526,7 +554,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "ensure_installed (5)",
+ "name": "ensure_installed (6)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/windows.json b/recipe_modules/flutter_deps/examples/full.expected/windows.json
index 55c44d0..424ee1a 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/windows.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/windows.json
@@ -273,7 +273,7 @@
"-root",
"[CACHE]\\android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -286,7 +286,35 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd.bat",
+ "ensure",
+ "-root",
+ "[CACHE]\\android",
+ "-ensure-file",
+ "flutter/android/sdk/all/${platform} version:29.0",
+ "-max-threads",
+ "0",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_installed (5)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:29.0----\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -464,7 +492,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "ensure_installed (5)",
+ "name": "ensure_installed (6)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
@@ -553,6 +581,7 @@
"cwd": "[CACHE]\\certs",
"env": {
"ANDROID_HOME": "[CACHE]\\android",
+ "ANDROID_NDK_PATH": "[CACHE]\\android\\ndk-bundle",
"ANDROID_SDK_ROOT": "[CACHE]\\android",
"CHROME_EXECUTABLE": "[CACHE]\\chrome\\chrome\\chrome.exe",
"CHROME_NO_SANDBOX": "true",
@@ -624,6 +653,7 @@
"cwd": "[CACHE]\\vsbuild",
"env": {
"ANDROID_HOME": "[CACHE]\\android",
+ "ANDROID_NDK_PATH": "[CACHE]\\android\\ndk-bundle",
"ANDROID_SDK_ROOT": "[CACHE]\\android",
"CHROME_EXECUTABLE": "[CACHE]\\chrome\\chrome\\chrome.exe",
"CHROME_NO_SANDBOX": "true",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/with-gems.json b/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
index 9ff9a16..f0b92c0 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
@@ -273,7 +273,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -286,7 +286,35 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "ensure",
+ "-root",
+ "[CACHE]/android",
+ "-ensure-file",
+ "flutter/android/sdk/all/${platform} version:29.0",
+ "-max-threads",
+ "0",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_installed (5)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:29.0----\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -464,7 +492,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "ensure_installed (5)",
+ "name": "ensure_installed (6)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
@@ -586,6 +614,7 @@
"cwd": "[CACHE]/avd",
"env": {
"ANDROID_HOME": "[CACHE]/android",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
"ANDROID_SDK_ROOT": "[CACHE]/android",
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
"CHROME_NO_SANDBOX": "true",
diff --git a/recipe_modules/flutter_deps/examples/full.py b/recipe_modules/flutter_deps/examples/full.py
index 85855e4..3c68a16 100644
--- a/recipe_modules/flutter_deps/examples/full.py
+++ b/recipe_modules/flutter_deps/examples/full.py
@@ -49,6 +49,7 @@
env, env_prefixes, [{'dependency': 'xcode'}, {'dependency': 'xcode'}]
)
api.flutter_deps.android_sdk(env, env_prefixes, '')
+ api.flutter_deps.android_sdk(env, env_prefixes, 'version:29.0')
api.flutter_deps.gradle_cache(env, env_prefixes, '')
api.flutter_deps.flutter_engine(env, env_prefixes)
api.flutter_deps.firebase(env, env_prefixes)
diff --git a/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json b/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json
index 4ef1eb5..75c76d5 100644
--- a/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json
+++ b/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json
@@ -151,7 +151,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -164,7 +164,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -209,8 +209,9 @@
],
"cwd": "[CACHE]/avd",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -297,8 +298,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
@@ -347,8 +349,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
@@ -396,8 +399,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -434,8 +438,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -481,8 +486,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -518,8 +524,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -557,8 +564,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -594,8 +602,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -637,8 +646,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -677,8 +687,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -714,8 +725,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -756,8 +768,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -794,8 +807,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -832,8 +846,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -870,8 +885,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -908,8 +924,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -950,8 +967,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
diff --git a/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json b/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json
index 71e66ce..72a9c15 100644
--- a/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json
+++ b/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json
@@ -151,7 +151,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -164,7 +164,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -209,8 +209,9 @@
],
"cwd": "[CACHE]/avd",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -297,8 +298,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
@@ -347,8 +349,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
@@ -396,8 +399,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -434,8 +438,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -481,8 +486,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -518,8 +524,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -557,8 +564,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -594,8 +602,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -637,8 +646,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -677,8 +687,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -714,8 +725,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -753,8 +765,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -794,8 +807,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -832,8 +846,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -870,8 +885,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -908,8 +924,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -946,8 +963,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -988,8 +1006,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/android_views",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
diff --git a/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json b/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json
index ccd731b..f35605c 100644
--- a/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json
+++ b/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json
@@ -151,7 +151,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -164,7 +164,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -209,8 +209,9 @@
],
"cwd": "[CACHE]/avd",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -297,8 +298,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
@@ -347,8 +349,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
@@ -396,8 +399,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -434,8 +438,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -481,8 +486,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -518,8 +524,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -557,8 +564,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -594,8 +602,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -640,8 +649,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -687,8 +697,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -722,8 +733,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -762,8 +774,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -799,8 +812,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -841,8 +855,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -879,8 +894,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -917,8 +933,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -955,8 +972,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -993,8 +1011,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -1035,8 +1054,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
diff --git a/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json b/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json
index 7d1526c..93c6fbc 100644
--- a/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json
+++ b/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json
@@ -151,7 +151,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -164,7 +164,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -209,8 +209,9 @@
],
"cwd": "[CACHE]/avd",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -297,8 +298,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
@@ -347,8 +349,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
@@ -396,8 +399,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -434,8 +438,9 @@
"cwd": "[CACHE]/avd",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -481,8 +486,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -518,8 +524,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -557,8 +564,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -594,8 +602,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -640,8 +649,9 @@
"cwd": "[START_DIR]/flutter sdk",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -687,8 +697,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -722,8 +733,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -762,8 +774,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -799,8 +812,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -838,8 +852,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -879,8 +894,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -917,8 +933,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -955,8 +972,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -993,8 +1011,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -1031,8 +1050,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
@@ -1073,8 +1093,9 @@
"cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
"env": {
"ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"EMULATOR_PID": "17687",
diff --git a/recipes/flutter/flutter_drone.expected/android_sdk.json b/recipes/flutter/flutter_drone.expected/android_sdk.json
index 818c216..2edb9b3 100644
--- a/recipes/flutter/flutter_drone.expected/android_sdk.json
+++ b/recipes/flutter/flutter_drone.expected/android_sdk.json
@@ -129,7 +129,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -142,7 +142,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -157,8 +157,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -191,8 +192,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -224,8 +226,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -271,8 +274,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -307,8 +311,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -343,8 +348,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -379,8 +385,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -415,8 +422,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -455,8 +463,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
diff --git a/recipes/flutter/flutter_drone.expected/android_sdk_reduced.json b/recipes/flutter/flutter_drone.expected/android_sdk_reduced.json
index 221d19c..fa0d04e 100644
--- a/recipes/flutter/flutter_drone.expected/android_sdk_reduced.json
+++ b/recipes/flutter/flutter_drone.expected/android_sdk_reduced.json
@@ -129,7 +129,7 @@
"-root",
"[CACHE]/android",
"-ensure-file",
- "flutter_internal/android/sdk/${platform} latest",
+ "flutter/android/sdk/all/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -142,7 +142,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter_internal/android/sdk/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/android/sdk/all/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -157,8 +157,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -191,8 +192,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -224,8 +226,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -271,8 +274,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -307,8 +311,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -343,8 +348,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -379,8 +385,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -415,8 +422,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
@@ -455,8 +463,9 @@
],
"cwd": "[START_DIR]/flutter",
"env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
+ "ANDROID_HOME": "[CACHE]/android/sdk",
+ "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
+ "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
