diff --git a/.gitignore b/.gitignore index 2ef0f39..b3cb0ae 100644 Binary files a/.gitignore and b/.gitignore differ diff --git a/Makefile b/Makefile index c932213..04e859f 100644 --- a/Makefile +++ b/Makefile @@ -3,33 +3,25 @@ all: build install build: - docker-compose run compile + docker-compose run --rm compile + ln -sv apk/bin/example.app.apk ./ install: - adb install -r ./apk/example.app.apk + adb install -r ./example.app.apk .PHONY: clean-all clean-all: clean-docker clean-apk - .PHONY: clean-docker clean-docker: rm docker-compose-build.log || true docker-compose down --remove-orphans --rmi all - .PHONY: clean-apk clean-apk: cd apk && $(MAKE) clean - -apk: apk/app.apk - true - -apk/app.apk: docker-compose-build.log - docker-compose run --rm compile - docker-compose-build.log: Dockerfile docker-compose.yml docker-compose down --remove-orphans --rmi all BUILDKIT_PROGRESS=plain docker-compose build | tee docker-compose-build.log diff --git a/README.md b/README.md index 844de2a..7e98831 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ This will generate the APK file `./apk/example.app.apk` this can be installed via `adb` ``` -adb install -r ./apk/example.app.apk +adb install -r ./example.app.apk # or alternative type make install ``` diff --git a/apk/Makefile b/apk/Makefile index a143967..4c0ca05 100644 --- a/apk/Makefile +++ b/apk/Makefile @@ -15,7 +15,7 @@ all: build .PHONY : clean build : ./bin/example.app.apk - ln -sf ./bin/example.app.apk ./example.app.apk + true ./bin/example.app.apk : ./bin/signed.apk $(ANDROID_HOME)/build-tools/$(ANDROID_VERSION)/zipalign -v -f 4 $< $@