Hacky, hacky build patches

HelloZeroNet · Aug 31, 2018 · 3db5878 · 3db5878
1 parent 4fd1470
commit 3db5878
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ script:
   - export DISABLE_PROGRESS=1
   - 'echo -e "EXEC=docker\nDOCKER_IMAGE=kivy\nDISABLE_PROGRESS=1" > .env'
   - make docker-build
-  - make .pre
+  - bash ./tool.sh prebuild
   - make _ci
 deploy:
   provider: releases

diff --git a/Makefile b/Makefile
@@ -12,9 +12,7 @@ _ci:
 	$(EXEC) make -C /home/data _ci_exec
 
 _ci_exec:
-	DISABLE_PROGRESS=true python2 buildozer-android-downloader/ /home/data/buildozer.spec
-	chmod +x $(HOME)/.buildozer/android/platform/android-sdk-25/tools/android
-	echo "y\n" | $(HOME)/.buildozer/android/platform/android-sdk-25/tools/android update sdk -u -a -t build-tools-25.0.4
+	DISABLE_PROGRESS=true make _pre
 	CI_MODE=1 buildozer android debug
 	#CI_MODE=1 buildozer android release
 
@@ -29,12 +27,13 @@ _ci_exec:
 .pre: .env .deps
 	$(TOOL) prebuild
 
-
 _pre:
 	python2 buildozer-android-downloader/ /home/data/buildozer.spec
 	chmod +x $(HOME)/.buildozer/android/platform/android-sdk-25/tools/android
-	echo "y\n" | $(HOME)/.buildozer/android/platform/android-sdk-25/tools/android update sdk -u -a -t build-tools-25.0.2
-_deps: #downloads sdk and ndk because buildozer is unable to download the newer ones
+	chmod +x $(HOME)/.buildozer/android/platform/android-sdk-25/tools/bin/*
+	echo "y\n" | $(HOME)/.buildozer/android/platform/android-sdk-25/tools/android update sdk -u -a -t build-tools-28.0.2
+	echo "y\n" | $(HOME)/.buildozer/android/platform/android-sdk-25/tools/android update sdk -u -a -t android-19
+_deps: # downloads sdk and ndk because buildozer is unable to download the newer ones
 	python2 buildozer-android-downloader/ $(PWD)/buildozer.spec
 	touch .deps
 
@@ -58,7 +57,7 @@ env:
 host-deps: env _pre _deps
 
 docker-deps:
-	$(EXEC) make -C /home/data _pre _deps || (mkdir -p $(HOME)/.buildozer && sudo chmod 777 $(HOME)/.buildozer && make docker-deps)
+	$(EXEC) make -C /home/data _pre _deps || (mkdir -p $(HOME)/.buildozer && sudo chmod 777 $(HOME)/.buildozer && mkdir -p $(HOME)/.android/cache && sudo chmod 777 $(HOME)/.android/cache && make docker-deps)
 
 # Targets
 

diff --git a/buildozer-android-downloader/AndroidComponent.py b/buildozer-android-downloader/AndroidComponent.py
@@ -103,6 +103,7 @@ def constructDir(self,zip=False):
     def constructUrl(self):
         #return "http://dl.google.com/android/android-sdk_r"+self.version_str+"-linux.tgz"
         return "https://dl.google.com/android/repository/tools_r"+self.version_str+"-linux.zip"
+        #return "https://dl.google.com/android/repository/sdk-tools-linux-"+self.version_str+".zip"
 
 class NDK(AndroidComponent):
     def constructDir(self,zip=False):

diff --git a/tool.sh b/tool.sh
@@ -18,10 +18,11 @@ NC="$normal" # No Color
 # Executors
 
 exec_docker() {
-  docker run -u "$UID" --rm --privileged=true -it -v "$PWD:/home/data" -v "$HOME/.buildozer:/home/.buildozer" -v "$HOME/.android:/home/.android" "$docker_image" sh -c "echo builder:x:$UID:27:Builder:/home:/bin/bash | tee /etc/passwd > /dev/null && cd /home/data && $*"
+  docker run -u "$UID" --rm --privileged=true -it -e "USE_SDK_WRAPPER=1" -v "$PWD:/home/data" -v "$HOME/.buildozer:/home/.buildozer" -v "$HOME/.android:/home/.android" "$docker_image" sh -c "echo builder:x:$UID:27:Builder:/home:/bin/bash | tee /etc/passwd > /dev/null && cd /home/data && $*"
 }
 
 exec_host() {
+  export USE_SDK_WRAPPER=1
   "$@"
 }