From 4d80b7122570d91759792ae425ad690240978bd4 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Wed, 14 Oct 2020 15:03:11 +0300 Subject: [PATCH 1/2] do not install obsolete build-tools packages --- images/linux/scripts/installers/android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 0f28d9c8e..2cfbdd8dd 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -67,7 +67,7 @@ additional=$(jq -r '.android.additional_tools[]' $toolset) components=( "${extras[@]}" "${addons[@]}" "${additional[@]}" ) availablePlatforms=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-" | cut -d"|" -f 1)) -allBuildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list --include_obsolete | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) +allBuildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/}) filter_components_by_version $minimumPlatformVersion "${availablePlatforms[@]}" From ad8f519477bea2c7e474e68a8063f00f193d17e0 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Wed, 14 Oct 2020 15:08:45 +0300 Subject: [PATCH 2/2] update mininal build_tools_min_version = 19.1.0 --- images/linux/toolsets/toolset-1604.json | 2 +- images/linux/toolsets/toolset-1804.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 4e93ee77b..1136ae921 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -64,7 +64,7 @@ ], "android": { "platform_min_version": "10", - "build_tools_min_version": "17.0.0", + "build_tools_min_version": "19.1.0", "extra_list": [ "android;m2repository", "google;m2repository", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 52357c3cf..de611ebc0 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -64,7 +64,7 @@ ], "android": { "platform_min_version": "17", - "build_tools_min_version": "17.0.0", + "build_tools_min_version": "19.1.0", "extra_list": [ "android;m2repository", "google;m2repository",