From da097a47c254f51e47521dd40eacf4a7f01f8656 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Fri, 1 Apr 2016 20:36:21 -0400 Subject: [PATCH] Use stable identifier to install android-18 platform It seems that the output of `android list sdk` changes over time, so we should not rely on its ordering of menu items. Instead, we can use stable identifiers that don't change. --- servo-build-dependencies/android.sls | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/servo-build-dependencies/android.sls b/servo-build-dependencies/android.sls index 8a6cadd1..86d6e91e 100644 --- a/servo-build-dependencies/android.sls +++ b/servo-build-dependencies/android.sls @@ -47,14 +47,10 @@ android-sdk: - require: - user: servo cmd.run: - # The arguments to --filter are from running 'android list sdk' - # Currently these are: - # platform-tool: Android SDK Platform-tools, revision 23.0.1 - # 9: SDK Platform Android 4.3.1, API 18, revision 3 - name: | expect -c ' set timeout -1; - spawn {{ common.servo_home }}/android/sdk/{{ android.sdk.version }}/android-sdk-linux/tools/android - update sdk --no-ui --filter platform-tool,9; + spawn {{ common.servo_home }}/android/sdk/{{ android.sdk.version }}/android-sdk-linux/tools/android - update sdk --no-ui --filter platform-tool,android-18; expect { "Do you accept the license" { exp_send "y\r" ; exp_continue } eof