Skip to content

Commit

Permalink
Update CI scripts for new Android build commands
Browse files Browse the repository at this point in the history
  • Loading branch information
matteblair committed Dec 21, 2016
1 parent 78ee2ce commit bc6f13f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ android: android-demo

android-sdk:
@cd android/ && \
./gradlew tangram:assembleDebug
./gradlew tangram:assembleFullRelease

android-demo:
@cd android/ && \
Expand Down
10 changes: 1 addition & 9 deletions scripts/travis/script_deploy_android_snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,8 @@ if [ "${PLATFORM}" = "android" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [
# Configure private repository credentials (used to sign release artifacts)
echo -e "machine github.com\n login $GITHUB_USERNAME\n password $GITHUB_PASSWORD" >> ~/.netrc

# Build all android architectures (armeabi-v7a already build)
make android-native-lib ANDROID_ARCH=x86
make android-native-lib ANDROID_ARCH=armeabi
make android-native-lib ANDROID_ARCH=arm64-v8a
#### Currently Not building the following architectures
#make android-native-lib ANDROID_ARCH=x86_64
#make android-native-lib ANDROID_ARCH=mips
#make android-native-lib ANDROID_ARCH=mips64
make android-sdk

make android-tangram-apk
cd "$TRAVIS_BUILD_DIR"/android
git clone https://github.com/mapzen/android-config.git
./gradlew uploadArchives -PsonatypeUsername="$SONATYPE_USERNAME" -PsonatypePassword="$SONATYPE_PASSWORD" -Psigning.keyId="$SIGNING_KEY_ID" -Psigning.password="$SIGNING_PASSWORD" -Psigning.secretKeyRingFile="$SIGNING_SECRET_KEY_RING_FILE"
Expand Down

0 comments on commit bc6f13f

Please sign in to comment.