Fix Travis CI and add build cache

Also remove relicts from Android.mk file
This commit is contained in:
Torsten Grote 2019-07-26 11:41:45 +02:00
parent 87b25aa4ec
commit 7b1e63a37f
No known key found for this signature in database
GPG key ID: 3E5F77D92CF891FF
2 changed files with 22 additions and 3 deletions

View file

@ -3,6 +3,28 @@ android:
components: components:
- build-tools-28.0.3 - build-tools-28.0.3
- android-28 - android-28
licenses:
- android-sdk-license-.+
- '.+'
before_install:
- mkdir "$ANDROID_HOME/licenses" || true
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" >> "$ANDROID_HOME/licenses/android-sdk-license"
- echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" >> "$ANDROID_HOME/licenses/android-sdk-license"
- echo -e "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" >> "$ANDROID_HOME/licenses/android-sdk-license"
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" >> "$ANDROID_HOME/licenses/android-sdk-preview-license"
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.android/build-cache
deploy: deploy:
provider: releases provider: releases
api_key: api_key:

View file

@ -32,7 +32,4 @@ LOCAL_CERTIFICATE := platform
LOCAL_STATIC_JAVA_LIBRARIES := commons-io LOCAL_STATIC_JAVA_LIBRARIES := commons-io
LOCAL_SRC_FILES := $(call all-java-files-under, java) LOCAL_SRC_FILES := $(call all-java-files-under, java)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_STATIC_ANDROID_LIBRARIES := \
androidx.preference_preference \
androidx.lifecycle_lifecycle-extensions
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)