lion/android-app-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix Makefile $$ issue

Browse source
This commit is contained in:
Alexander Mahr 2024-10-09 18:24:55 +02:00
parent f1dcecf971
commit 452082de2a
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -4,7 +4,7 @@ all: build install
build: build:
docker-compose run --rm compile docker-compose run --rm compile
ln -sf apk/bin/example.app.apk ./; test -e ./example.app.apk || rm ./example.app.apk ln -sf apk/result/example.app.apk ./; test -e ./example.app.apk || rm ./example.app.apk
install: install:
adb install -r ./example.app.apk adb install -r ./example.app.apk

20
apk/Makefile
View file

@ -14,17 +14,22 @@ all: build
.PHONY : deploy .PHONY : deploy
.PHONY : clean .PHONY : clean
build : ./bin/example.app.apk build : ./result/example.app.apk
true true
./bin/example.app.apk : ./bin/signed.apk env:
set > set ; env > env
./result/example.app.apk : ./result/signed.apk
$(ANDROID_HOME)/build-tools/$(ANDROID_VERSION)/zipalign -v -f 4 $< $@ $(ANDROID_HOME)/build-tools/$(ANDROID_VERSION)/zipalign -v -f 4 $< $@
$(ANDROID_HOME)/build-tools/$(ANDROID_VERSION)/apksigner sign --ks ToyKey.keystore --key-pass pass:armena --ks-pass pass:armena $@ $(ANDROID_HOME)/build-tools/$(ANDROID_VERSION)/apksigner sign --ks ToyKey.keystore --key-pass pass:armena --ks-pass pass:armena $@
./bin/signed.apk : ./bin/unsigned.apk ./ToyKey.keystore ./result/signed.apk : ./result/unsigned.apk ./ToyKey.keystore ./result
jarsigner -verbose -keystore ./ToyKey.keystore -storepass armena -keypass armena -signedjar $@ $< helljniKey jarsigner -verbose -keystore ./ToyKey.keystore -storepass armena -keypass armena -signedjar $@ $< helljniKey
./bin/unsigned.apk : ./bin/classes.dex ./result:
mkdir -p "$@"
./result/unsigned.apk : ./bin/classes.dex ./result
rm -rvf "$@" rm -rvf "$@"
$(ANDROID_HOME)/build-tools/$(ANDROID_VERSION)/aapt package -v -u -f -M ./AndroidManifest.xml -S ./res \ $(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 -I $(ANDROID_HOME)/platforms/$(PLATFORM)/android.jar -F $@ ./bin
@ -32,8 +37,9 @@ build : ./bin/example.app.apk
#./bin/classes.dex : ./obj/app/example/ExampleApp.class ./obj/app/example/ExampleApp$$1.class ./obj/app/example/MyJavascriptInterface.class #./bin/classes.dex : ./obj/app/example/ExampleApp.class ./obj/app/example/ExampleApp$$1.class ./obj/app/example/MyJavascriptInterface.class
#./bin/classes.dex : ./obj/app/example/ExampleApp.class ./obj/app/example/MyJavascriptInterface.class ./obj/app/example/MyRunnable.class #./bin/classes.dex : ./obj/app/example/ExampleApp.class ./obj/app/example/MyJavascriptInterface.class ./obj/app/example/MyRunnable.class
#./bin/classes.dex : ./obj/app/example/ExampleApp.class ./obj/app/example/MyJavascriptInterface.class ./obj/app/example/MyRunnable.class #./bin/classes.dex : ./obj/app/example/ExampleApp.class ./obj/app/example/MyJavascriptInterface.class ./obj/app/example/MyRunnable.class
./bin/classes.dex : ./obj/app/example/ExampleApp.class ./bin/classes.dex : ./obj/app/example/ExampleApp.class ./obj/app/example/ExampleApp$$1.class
$(ANDROID_HOME)/build-tools/$(ANDROID_VERSION)/d8 $^ --lib $(ANDROID_HOME)/platforms/$(PLATFORM)/android.jar --output bin # $(ANDROID_HOME)/build-tools/$(ANDROID_VERSION)/d8 ./obj/app/example/*.class --classpath ./obj/ --lib $(ANDROID_HOME)/platforms/$(PLATFORM)/android.jar --output bin
$(ANDROID_HOME)/build-tools/$(ANDROID_VERSION)/d8 ./obj/app/example/*.class --lib $(ANDROID_HOME)/platforms/$(PLATFORM)/android.jar --output bin
./src/app/example/R.java : $(shell find ./res -type f) ./src/app/example/R.java : $(shell find ./res -type f)
$(ANDROID_HOME)/build-tools/$(ANDROID_VERSION)/aapt package -v -f -m -S ./res -J ./src -M ./AndroidManifest.xml \ $(ANDROID_HOME)/build-tools/$(ANDROID_VERSION)/aapt package -v -f -m -S ./res -J ./src -M ./AndroidManifest.xml \
@ -47,4 +53,4 @@ build : ./bin/example.app.apk
-storepass armena -keypass armena -alias helljniKey -keyalg RSA -v -storepass armena -keypass armena -alias helljniKey -keyalg RSA -v
clean: clean:
rm -f ./bin/* ./lib/arm64-v8a/* rm -f ./bin/* ./lib/arm64-v8a/* ./result/*