Use apksigner from the build tools for release builds too

2 files changed, 4 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index bf04f7b..10f7fb4 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ _build/$(PACKAGE_NAME).debug.unsigned-apk: AAPT_PACKAGE_FLAGS+=--rename-manifest
 #  it is interpreted as a shell script
 _build/%.apk: _build/%.unsigned-apk %-keystore.conf
 	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"
 
 # Package
diff --git a/shell.nix b/shell.nix
index 643f47f..76ee98e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -12,12 +12,8 @@ let
     abiVersions = [ "armeabi-v7a" ];
   };
 
-  apksigner = pkgs.apksigner.override {
-    inherit (jdk) jre;
-    inherit (android) build-tools;
-  };
-
-in pkgs.mkShell {
-  buildInputs = [ pkgs.findutils jdk android.androidsdk apksigner ];
+in
+pkgs.mkShell {
+  buildInputs = [ pkgs.findutils jdk android.androidsdk ];
   ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
 }