forked from extern/Unexpected-Keyboard
Use apksigner from the build tools for release builds too
This commit is contained in:
parent
be0f4a1fc9
commit
e86173b895
2
Makefile
2
Makefile
@ -68,7 +68,7 @@ _build/$(PACKAGE_NAME).debug.unsigned-apk: AAPT_PACKAGE_FLAGS+=--rename-manifest
|
|||||||
# it is interpreted as a shell script
|
# it is interpreted as a shell script
|
||||||
_build/%.apk: _build/%.unsigned-apk %-keystore.conf
|
_build/%.apk: _build/%.unsigned-apk %-keystore.conf
|
||||||
eval `cat $(word 2,$^)` && \
|
eval `cat $(word 2,$^)` && \
|
||||||
apksigner sign --in "$<" --out "$@" \
|
$(ANDROID_BUILD_TOOLS)/apksigner sign --in "$<" --out "$@" \
|
||||||
--ks "$$KEYSTORE" --ks-key-alias "$$KEYNAME" --ks-pass "pass:$$KEYSTOREPASS"
|
--ks "$$KEYSTORE" --ks-key-alias "$$KEYNAME" --ks-pass "pass:$$KEYSTOREPASS"
|
||||||
|
|
||||||
# Package
|
# Package
|
||||||
|
10
shell.nix
10
shell.nix
@ -12,12 +12,8 @@ let
|
|||||||
abiVersions = [ "armeabi-v7a" ];
|
abiVersions = [ "armeabi-v7a" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
apksigner = pkgs.apksigner.override {
|
in
|
||||||
inherit (jdk) jre;
|
pkgs.mkShell {
|
||||||
inherit (android) build-tools;
|
buildInputs = [ pkgs.findutils jdk android.androidsdk ];
|
||||||
};
|
|
||||||
|
|
||||||
in pkgs.mkShell {
|
|
||||||
buildInputs = [ pkgs.findutils jdk android.androidsdk apksigner ];
|
|
||||||
ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
|
ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user