fix issue with apk being add into itself
This commit is contained in:
parent
033219169b
commit
703e34f0b4
4 changed files with 5 additions and 13 deletions
BIN
.gitignore
vendored
BIN
.gitignore
vendored
Binary file not shown.
14
Makefile
14
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
|
||||
|
|
|
@ -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
|
||||
```
|
||||
|
|
|
@ -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 $< $@
|
||||
|
|
Loading…
Add table
Reference in a new issue