From 97391dedecedf956af6225c2d6607cbb04240ae0 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Fri, 27 May 2016 03:36:12 -0400 Subject: [PATCH] Install Android build tools for cross compilation The Android build tools are required for building an APK. They are versioned separately from the SDK and do not have a version requirement - best practice is to use the latest (stable) release. --- servo-build-dependencies/android.sls | 3 ++- servo-build-dependencies/map.jinja | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/servo-build-dependencies/android.sls b/servo-build-dependencies/android.sls index 09df25de..c43eb8f2 100644 --- a/servo-build-dependencies/android.sls +++ b/servo-build-dependencies/android.sls @@ -50,7 +50,7 @@ android-sdk: - 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,android-{{ android.platform }}; + spawn {{ common.servo_home }}/android/sdk/{{ android.sdk.version }}/android-sdk-linux/tools/android - update sdk --no-ui --all --filter platform-tools,android-{{ android.platform }},build-tools-{{ android.build_tools }}; expect { "Do you accept the license" { exp_send "y\r" ; exp_continue } eof @@ -60,6 +60,7 @@ android-sdk: - creates: - {{ common.servo_home }}/android/sdk/{{ android.sdk.version }}/android-sdk-linux/platform-tools - {{ common.servo_home }}/android/sdk/{{ android.sdk.version }}/android-sdk-linux/platforms/android-{{ android.platform }} + - {{ common.servo_home }}/android/sdk/{{ android.sdk.version }}/android-sdk-linux/build-tools/{{ android.build_tools }} - require: - pkg: android-dependencies - archive: android-sdk diff --git a/servo-build-dependencies/map.jinja b/servo-build-dependencies/map.jinja index 5205e0eb..e926b4c9 100644 --- a/servo-build-dependencies/map.jinja +++ b/servo-build-dependencies/map.jinja @@ -1,5 +1,6 @@ {% set android = { + 'build_tools': '23.0.3', 'platform': '18', 'sdk': { 'version': 'r24.4.1',