android, overhaul required and additional, remove Images comment and only pull sources and platform for the compile SDK version (36), upgrade build-tools to 37 and pull SDK 24 as new minimum.
This commit is contained in:
@@ -70,72 +70,68 @@
|
|||||||
- name: Workstation | Linux | Software | Android | Facts [Downloads]
|
- name: Workstation | Linux | Software | Android | Facts [Downloads]
|
||||||
set_fact:
|
set_fact:
|
||||||
android_downloads_required:
|
android_downloads_required:
|
||||||
|
### 37 ###
|
||||||
|
- build-tools/37.0.0
|
||||||
|
### 36 ###
|
||||||
|
- platforms;android-36
|
||||||
|
- sources/android-36
|
||||||
|
- system-images;android-36;default;x86_64
|
||||||
|
### 24 ###
|
||||||
|
- system-images;android-24;default;x86_64
|
||||||
|
android_downloads_additional:
|
||||||
|
### 30 ###
|
||||||
|
- system-images;android-30;default;x86_64
|
||||||
|
### 16 ###
|
||||||
|
- system-images;android-16;default;x86
|
||||||
|
android_downloads_unused:
|
||||||
### 36 ###
|
### 36 ###
|
||||||
- build-tools;36.0.0
|
- build-tools;36.0.0
|
||||||
- platforms;android-36
|
- platforms;android-36
|
||||||
- sources;android-36
|
- sources;android-36
|
||||||
# Images
|
- system-images;android-36;default;x86_64
|
||||||
#- system-images;android-35;default;x86_64 # TODO: Switch once it exists.
|
|
||||||
- system-images;android-36;google_apis_playstore;x86_64
|
- system-images;android-36;google_apis_playstore;x86_64
|
||||||
### 16 ###
|
|
||||||
- platforms;android-16
|
|
||||||
- sources;android-16
|
|
||||||
# Images
|
|
||||||
- system-images;android-16;default;x86
|
|
||||||
android_downloads_additional:
|
|
||||||
### 35 ###
|
|
||||||
- platforms;android-35
|
|
||||||
- sources;android-35
|
|
||||||
# Images
|
|
||||||
- system-images;android-35;default;x86_64
|
|
||||||
### 34 ###
|
|
||||||
- platforms;android-34
|
|
||||||
- sources;android-34
|
|
||||||
# Images
|
|
||||||
- system-images;android-34;default;x86_64
|
|
||||||
### 33 ###
|
|
||||||
- platforms;android-33
|
|
||||||
- sources;android-33
|
|
||||||
# Images
|
|
||||||
- system-images;android-33;default;x86_64
|
|
||||||
### 30 ###
|
|
||||||
- platforms;android-30
|
|
||||||
- sources;android-30
|
|
||||||
# Images
|
|
||||||
- system-images;android-30;default;x86_64
|
|
||||||
### 27 ###
|
|
||||||
- platforms;android-27
|
|
||||||
- sources;android-27
|
|
||||||
# Images
|
|
||||||
- system-images;android-27;default;x86_64
|
|
||||||
### 21 ###
|
|
||||||
- platforms;android-21
|
|
||||||
- sources;android-21
|
|
||||||
# Images
|
|
||||||
- system-images;android-21;default;x86_64
|
|
||||||
android_downloads_unused:
|
|
||||||
### 36 ###
|
|
||||||
# Images
|
|
||||||
- system-images;android-36;google_apis;x86_64
|
- system-images;android-36;google_apis;x86_64
|
||||||
### 35 ###
|
### 35 ###
|
||||||
- build-tools;35.0.0
|
- build-tools;35.0.0
|
||||||
- build-tools;35.0.1
|
- build-tools;35.0.1
|
||||||
# Images
|
- platforms;android-35
|
||||||
|
- sources;android-35
|
||||||
|
- system-images;android-35;default;x86_64
|
||||||
- system-images;android-35;aosp_atd;x86_64 # ATD = Automated Test Device
|
- system-images;android-35;aosp_atd;x86_64 # ATD = Automated Test Device
|
||||||
- system-images;android-35;google_apis;x86_64
|
- system-images;android-35;google_apis;x86_64
|
||||||
- system-images;android-35;google_apis_playstore;x86_64
|
- system-images;android-35;google_apis_playstore;x86_64
|
||||||
### 34 ###
|
### 34 ###
|
||||||
- build-tools;34.0.0
|
- build-tools;34.0.0
|
||||||
# Images
|
- platforms;android-34
|
||||||
|
- sources;android-34
|
||||||
|
- system-images;android-34;default;x86_64
|
||||||
- system-images;android-34;google_apis;x86_64
|
- system-images;android-34;google_apis;x86_64
|
||||||
- system-images;android-34;google_apis_playstore;x86_64
|
- system-images;android-34;google_apis_playstore;x86_64
|
||||||
|
### 33 ###
|
||||||
|
- platforms;android-33
|
||||||
|
- sources;android-33
|
||||||
|
- system-images;android-33;default;x86_64
|
||||||
|
### 30 ###
|
||||||
|
- platforms;android-30
|
||||||
|
- sources;android-30
|
||||||
|
### 27 ###
|
||||||
|
- platforms;android-27
|
||||||
|
- sources;android-27
|
||||||
|
- system-images;android-27;default;x86_64
|
||||||
|
### 24 ###
|
||||||
|
- platforms;android-24
|
||||||
|
- sources;android-24
|
||||||
|
### 21 ###
|
||||||
|
- platforms;android-21
|
||||||
|
- sources;android-21
|
||||||
|
- system-images;android-21;default;x86_64
|
||||||
### 16 ###
|
### 16 ###
|
||||||
# Images
|
- platforms;android-16
|
||||||
|
- sources;android-16
|
||||||
- system-images;android-16;google_apis;x86
|
- system-images;android-16;google_apis;x86
|
||||||
### 15 ###
|
### 15 ###
|
||||||
- platforms;android-15
|
- platforms;android-15
|
||||||
- sources;android-15
|
- sources;android-15
|
||||||
# Images
|
|
||||||
- system-images;android-15;default;x86 # Not working in Android AVDs
|
- system-images;android-15;default;x86 # Not working in Android AVDs
|
||||||
|
|
||||||
## Checks ##
|
## Checks ##
|
||||||
@@ -221,7 +217,7 @@
|
|||||||
group: "{{ user }}"
|
group: "{{ user }}"
|
||||||
|
|
||||||
become_user: "{{ user }}"
|
become_user: "{{ user }}"
|
||||||
when: coding == true
|
when: coding == true
|
||||||
and not android_sdkmanager_temp_stat.stat.exists
|
and not android_sdkmanager_temp_stat.stat.exists
|
||||||
|
|
||||||
- name: Workstation | Linux | Software | Android | Delete Archive
|
- name: Workstation | Linux | Software | Android | Delete Archive
|
||||||
@@ -240,7 +236,7 @@
|
|||||||
- platform-tools
|
- platform-tools
|
||||||
- emulator
|
- emulator
|
||||||
become_user: "{{ user }}"
|
become_user: "{{ user }}"
|
||||||
when: coding == true
|
when: coding == true
|
||||||
and not android_sdkmanager_final_stat.stat.exists
|
and not android_sdkmanager_final_stat.stat.exists
|
||||||
|
|
||||||
# These are safe to run multiple times, and uses the new `latest` version.
|
# These are safe to run multiple times, and uses the new `latest` version.
|
||||||
@@ -261,7 +257,7 @@
|
|||||||
fi
|
fi
|
||||||
loop: "{{ android_downloads_additional }}"
|
loop: "{{ android_downloads_additional }}"
|
||||||
become_user: "{{ user }}"
|
become_user: "{{ user }}"
|
||||||
when: coding == true
|
when: coding == true
|
||||||
and sdks == true
|
and sdks == true
|
||||||
|
|
||||||
# Remove extra downloads if system is not meant for full amount of testing.
|
# Remove extra downloads if system is not meant for full amount of testing.
|
||||||
@@ -269,7 +265,7 @@
|
|||||||
shell: "yes | {{ android_sdkmanager_final }} --uninstall '{{ item }}' --sdk_root={{ android_sdk_location }}"
|
shell: "yes | {{ android_sdkmanager_final }} --uninstall '{{ item }}' --sdk_root={{ android_sdk_location }}"
|
||||||
loop: "{{ android_downloads_additional }}"
|
loop: "{{ android_downloads_additional }}"
|
||||||
become_user: "{{ user }}"
|
become_user: "{{ user }}"
|
||||||
when: coding != true
|
when: coding != true
|
||||||
or sdks != true
|
or sdks != true
|
||||||
ignore_errors: yes
|
ignore_errors: yes
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user