From 02438c91d3af2fb7eff231e61b1327807b7f65ed Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 10 Sep 2020 04:48:25 +0530 Subject: [PATCH] Drop prebuilt deployment * With Android.bp support merged in (and working well for both 10 and 11), we keep that as the primary and supported method to integrate Seedvault. * Gradle can still be used for development * You can still use your own prebuilts if you want, we just won't be putting them out ourselves --- .travis.yml | 9 --------- Android.mk.prebuilt | 27 --------------------------- deploy-prebuilt.sh | 27 --------------------------- 3 files changed, 63 deletions(-) delete mode 100644 Android.mk.prebuilt delete mode 100755 deploy-prebuilt.sh diff --git a/.travis.yml b/.travis.yml index d8719b9f..aa16c9cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,12 +31,3 @@ cache: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ - $HOME/.android/build-cache - -deploy: - provider: script - script: ./deploy-prebuilt.sh - skip_cleanup: true - on: - repo: stevesoltys/seedvault - all_branches: true - condition: $TRAVIS_BRANCH =~ ^(master|develop)$ diff --git a/Android.mk.prebuilt b/Android.mk.prebuilt deleted file mode 100644 index 2adfced8..00000000 --- a/Android.mk.prebuilt +++ /dev/null @@ -1,27 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := permissions_com.stevesoltys.seedvault.xml -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions -LOCAL_SRC_FILES := $(LOCAL_MODULE) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := whitelist_com.stevesoltys.seedvault.xml -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig -LOCAL_SRC_FILES := $(LOCAL_MODULE) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := Seedvault -LOCAL_SRC_FILES := Seedvault.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_CLASS := APPS -LOCAL_PRIVILEGED_MODULE := true -LOCAL_DEX_PREOPT := false -LOCAL_REQUIRED_MODULES := permissions_com.stevesoltys.seedvault.xml whitelist_com.stevesoltys.seedvault.xml -include $(BUILD_PREBUILT) diff --git a/deploy-prebuilt.sh b/deploy-prebuilt.sh deleted file mode 100755 index 58062933..00000000 --- a/deploy-prebuilt.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# -# Script to deploy to a prebuilt repo. - -REPO_URL="https://stevesoltys:$GITHUB_API_KEY@github.com/stevesoltys/seedvault-prebuilt" -TAG=$(git tag -l --points-at HEAD) - -git config --global user.email "github@stevesoltys.com" -git config --global user.name "Steve Soltys" -git clone --quiet $REPO_URL - -cd seedvault-prebuilt -git checkout $TRAVIS_BRANCH || git checkout -b $TRAVIS_BRANCH -rm -Rf ./* -cp $TRAVIS_BUILD_DIR/Android.mk.prebuilt ./Android.mk -cp $TRAVIS_BUILD_DIR/app/build/outputs/apk/release/app-release-unsigned.apk ./Seedvault.apk -cp $TRAVIS_BUILD_DIR/permissions_com.stevesoltys.seedvault.xml . -cp $TRAVIS_BUILD_DIR/whitelist_com.stevesoltys.seedvault.xml . - -git add . -git commit -m "Travis build $TRAVIS_BUILD_NUMBER" -m "https://github.com/stevesoltys/seedvault/commit/$TRAVIS_COMMIT" -git push origin $TRAVIS_BRANCH - -if [ ! -z ${TAG} ]; then - git tag ${TAG} - git push origin --tags -fi \ No newline at end of file