Merge "Add apksigner tool to Android O SDK build-tools" into oc-dev

build/product_sdk.mk

@@ -31,6 +31,7 @@ PRODUCT_PACKAGES += \
 	aapt2 \
 	adb \
 	aidl \
+	apksigner \
 	zipalign \
 	bcc_compat \
 	bios.bin \

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
 

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