improve Makefiles

Makefile

@@ -8,17 +8,30 @@ build:
 install: 
 	adb install -r ./apk/example.app.apk
 
-clean: 
+.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 compile 
+	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 --no-cache | tee docker-compose-build.log 
+	BUILDKIT_PROGRESS=plain docker-compose build | tee docker-compose-build.log 
+
 

apk/Makefile

@@ -25,6 +25,7 @@ build : ./bin/example.app.apk
 	jarsigner -verbose -keystore ./ToyKey.keystore -storepass armena -keypass armena -signedjar $@ $< helljniKey
 		
 ./bin/unsigned.apk : ./bin/classes.dex 
+	rm -rvf "$@"
 	$(ANDROID_HOME)/build-tools/$(ANDROID_VERSION)/aapt package -v -u -f -M ./AndroidManifest.xml -S ./res \
 	-I $(ANDROID_HOME)/platforms/$(PLATFORM)/android.jar -F $@ ./bin