From 9022cd47185417c69b4ad5a0145b1b5cc109c383 Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Thu, 15 Sep 2016 14:38:00 -0700 Subject: [PATCH] Add apksigner tool to Android O SDK build-tools This places apksigner command-line tool in Android SDK's build-tools directory. The tool is intended as an Android-specific replacement for jarsigner. Bug: 62696222 Change-Id: I099ea6840d0e7e0b00f438357543cb656990442a (cherry picked from commit a825e5d309629b2f9cb3b52ba6d9895562729001) --- build/product_sdk.mk | 1 + build/sdk-windows-x86.atree | 3 +++ build/sdk.atree | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/build/product_sdk.mk b/build/product_sdk.mk index 889de258d..33929a453 100644 --- a/build/product_sdk.mk +++ b/build/product_sdk.mk @@ -31,6 +31,7 @@ PRODUCT_PACKAGES += \ aapt2 \ adb \ aidl \ + apksigner \ zipalign \ bcc_compat \ bios.bin \ diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index 0f6a76b45..bd1537645 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -77,6 +77,9 @@ bin/split-select.exe strip build-tools/${PLATFORM_NAME}/split rm build-tools/${PLATFORM_NAME}/aidl bin/aidl.exe strip build-tools/${PLATFORM_NAME}/aidl.exe +rm build-tools/${PLATFORM_NAME}/apksigner +tools/apksig/etc/apksigner.bat build-tools/${PLATFORM_NAME}/apksigner.bat + rm build-tools/${PLATFORM_NAME}/zipalign bin/zipalign.exe strip build-tools/${PLATFORM_NAME}/zipalign.exe diff --git a/build/sdk.atree b/build/sdk.atree index 658de57d4..ef80f3875 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -128,6 +128,10 @@ prebuilts/sdk/renderscript/lib/x86_64/librsjni.so build-tools/${PLATFORM prebuilts/sdk/renderscript/lib/x86_64/libblasV8.so build-tools/${PLATFORM_NAME}/renderscript/lib/blas/x86_64/libblasV8.so prebuilts/sdk/renderscript/lib/x86_64/librsrt_x86_64.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/x86_64/libclcore.bc +# apksigner +bin/apksigner build-tools/${PLATFORM_NAME}/apksigner +framework/apksigner.jar build-tools/${PLATFORM_NAME}/lib/apksigner.jar + # dx bin/dx build-tools/${PLATFORM_NAME}/dx framework/dx.jar build-tools/${PLATFORM_NAME}/lib/dx.jar