re-enable android/ios build in default_app and flavors

mmcc007 · Feb 29, 2020 · 2bfe3e9 · 2bfe3e9
1 parent 5859946
commit 2bfe3e9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,35 +32,35 @@ jobs:
       # if: tag IS present
       before_install:
 
-#      # Set up JDK 8 for Android SDK
-#      - java -version
-#      - curl "${GRAVIS}.install-jdk-travis.sh" --output ~/.install-jdk-travis.sh
-#      - export TARGET_JDK="${JDK}"
-#      - JDK="${JDK_SDKMANAGER}" # used when running sdkmanager
-#      - source ~/.install-jdk-travis.sh
-#      - java -version
-#
-#      # Add missing java module used by sdkmanager, etc...
-#      # - export JAVA_OPTS='-XX:+IgnoreUnrecognizedVMOptions --add-modules java.se.ee'
-#
-#      # Install android tools
-#      - export ANDROID_HOME=~/android-sdk
-#      - wget -q "https://dl.google.com/android/repository/$ANDROID_SDK_TOOLS" -O android-sdk-tools.zip
-#      - unzip -q android-sdk-tools.zip -d ${ANDROID_HOME}
-#      - rm android-sdk-tools.zip
-#      - PATH=${PATH}:${ANDROID_HOME}/emulator:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools
-#      # Silence warning.
-#      - mkdir -p ~/.android
-#      - touch ~/.android/repositories.cfg
-##      - sdkmanager --sdk_root=$ANDROID_HOME --version
-#      - sdkmanager --version
-#      # Accept licenses before installing components, no need to echo y for each component
-#      - yes | sdkmanager --licenses > /dev/null
-#      # - sdkmanager --list | head -15
-#      # Platform and build tools
-#      - sdkmanager "tools" "platform-tools" "platforms;android-${ANDROID_PLATFORM_SDK}" "build-tools;${ANDROID_BUILD_TOOLS}" > /dev/null
-#      # - sdkmanager --list | head -15
-#      - sdkmanager --version
+      # Set up JDK 8 for Android SDK
+      - java -version
+      - curl "${GRAVIS}.install-jdk-travis.sh" --output ~/.install-jdk-travis.sh
+      - export TARGET_JDK="${JDK}"
+      - JDK="${JDK_SDKMANAGER}" # used when running sdkmanager
+      - source ~/.install-jdk-travis.sh
+      - java -version
+
+      # Add missing java module used by sdkmanager, etc...
+      # - export JAVA_OPTS='-XX:+IgnoreUnrecognizedVMOptions --add-modules java.se.ee'
+
+      # Install android tools
+      - export ANDROID_HOME=~/android-sdk
+      - wget -q "https://dl.google.com/android/repository/$ANDROID_SDK_TOOLS" -O android-sdk-tools.zip
+      - unzip -q android-sdk-tools.zip -d ${ANDROID_HOME}
+      - rm android-sdk-tools.zip
+      - PATH=${PATH}:${ANDROID_HOME}/emulator:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools
+      # Silence warning.
+      - mkdir -p ~/.android
+      - touch ~/.android/repositories.cfg
+#      - sdkmanager --sdk_root=$ANDROID_HOME --version
+      - sdkmanager --version
+      # Accept licenses before installing components, no need to echo y for each component
+      - yes | sdkmanager --licenses > /dev/null
+      # - sdkmanager --list | head -15
+      # Platform and build tools
+      - sdkmanager "tools" "platform-tools" "platforms;android-${ANDROID_PLATFORM_SDK}" "build-tools;${ANDROID_BUILD_TOOLS}" > /dev/null
+      # - sdkmanager --list | head -15
+      - sdkmanager --version
 
       # Switch back to our target JDK version to build and run tests
 #      - JDK="${TARGET_JDK}"

diff --git a/example/default_app/sylph.yaml b/example/default_app/sylph.yaml
@@ -54,7 +54,7 @@ test_suites:
       - test_driver/main_test.dart
       - test_driver/main_test.dart
     pool_names:
-#      - android pool 1
+      - android pool 1
       - ios pool 1
 #      - iPhone 5c
     job_timeout: 15 # minutes, set per job, over-rides default job timeout above
diff --git a/example/flavors/sylph.yaml b/example/flavors/sylph.yaml
@@ -56,7 +56,7 @@ test_suites:
     tests:
       - test_driver/main_test.dart
     pool_names:
-#      - android pool 1
+      - android pool 1
       - ios pool 1
 #      - iPhone 5c
     job_timeout: 15 # minutes, set per job, over-rides default job timeout above