Skip to content

Commit

Permalink
Merge pull request #56 from kollivier/arch_mehearty
Browse files Browse the repository at this point in the history
Add arch argument to makefile.
  • Loading branch information
jamalex authored Apr 24, 2020
2 parents 0fe17ee + 741228a commit 2e6c938
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ARCH=

# Clear out apks
clean:
- rm -rf dist/android/*.apk project_info.json ./src/kolibri
Expand All @@ -18,7 +20,7 @@ project_info.json: project_info.template src/kolibri scripts/create_project_info

.PHONY: p4a_android_distro
p4a_android_distro: whitelist.txt project_info.json
pew init android
pew init android $(ARCH)

ifdef P4A_RELEASE_KEYSTORE_PASSWD
pew_release_flag = --release
Expand All @@ -27,7 +29,7 @@ endif
.PHONY: kolibri.apk
# Buld the debug version of the apk
kolibri.apk: p4a_android_distro
pew build android $(pew_release_flag)
pew build android $(pew_release_flag) $(ARCH)

# DOCKER BUILD

Expand All @@ -48,7 +50,7 @@ run_docker: build_docker
./scripts/rundocker.sh

launch:
pew build android $(pew_release_flag)
pew build android $(pew_release_flag) $(ARCH)
adb uninstall org.learningequality.Kolibri || true 2> /dev/null
rm dist/android/Kolibri-0-debug.apk || true 2> /dev/null
adb install dist/android/*-debug.apk
Expand Down

0 comments on commit 2e6c938

Please sign in to comment.