Merge remote-tracking branch 'origin/master' into settingsui

This commit is contained in:
Overtorment 2020-03-20 17:35:57 +00:00
commit d6201aa804
3 changed files with 4 additions and 2 deletions

2
.gitignore vendored
View file

@ -60,3 +60,5 @@ release-notes.json
release-notes.txt
ios/Pods/
artifacts/

View file

@ -57,7 +57,7 @@ install:
# Create an Android emulator
- echo no | avdmanager create avd --force -n Pixel_API_29_AOSP -k "system-images;android-$API;$EMU_FLAVOR;$ABI" -c 10M
- printf "\nhw.lcd.height=1920\nhw.lcd.width=1080\nhw.lcd.density=320\nskin.name=1080x1920" >> /home/travis/.android/avd/Pixel_API_29_AOSP.avd/config.ini
- printf "\nhw.lcd.height=1334\nhw.lcd.width=750\nhw.lcd.density=320\nskin.name=750x1334" >> /home/travis/.android/avd/Pixel_API_29_AOSP.avd/config.ini
- |
EMU_PARAMS="-verbose -no-snapshot -no-window -camera-back none -camera-front none -selinux permissive -qemu -m 2048"
EMU_COMMAND="emulator"

View file

@ -1,4 +1,4 @@
$ANDROID_HOME/tools/bin/sdkmanager "system-images;android-28;default;x86_64"
echo no | $ANDROID_HOME/tools/bin/sdkmanager --licenses
echo no | $ANDROID_HOME/tools/bin/avdmanager create avd -n Pixel_API_29_AOSP --force --package "system-images;android-28;default;x86_64"
printf "\nhw.lcd.height=1920\nhw.lcd.width=1080\nhw.lcd.density=320\nskin.name=1080x1920" >> ~/.android/avd/Pixel_API_29_AOSP.avd/config.ini
printf "\nhw.lcd.height=1334\nhw.lcd.width=750\nhw.lcd.density=320\nskin.name=750x1334" >> ~/.android/avd/Pixel_API_29_AOSP.avd/config.ini