From c10f6d5638b6e4e986c23bd2a5818b10b2cf5fb5 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sat, 11 Aug 2012 16:34:32 +0530 Subject: [PATCH] squisher: replace $ANDROID_BUILD_TOP Now uses $OUT/../../../host instead of $ANDROID_BUILD_TOP/out/host fixes build when used with OUT_DIR_COMMON_BASE Change-Id: Ib1934b57f3e94a3c3af10189c803fc494438a4a4 --- tools/opticharger | 4 ++-- tools/squisher | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/opticharger b/tools/opticharger index c8c86f5a..33489d86 100755 --- a/tools/opticharger +++ b/tools/opticharger @@ -135,8 +135,8 @@ then [ $QUIET ] || echo "Resigning with cert: `echo $CERT`" - [ $QUIET ] || echo java -jar $ANDROID_BUILD_TOP/out/host/$OUT_TARGET_HOST/framework/signapk.jar $ANDROID_BUILD_TOP/$CERT $ANDROID_BUILD_TOP/$KEY $NAME signed_$NAME - java -jar $ANDROID_BUILD_TOP/out/host/$OUT_TARGET_HOST/framework/signapk.jar $ANDROID_BUILD_TOP/$CERT $ANDROID_BUILD_TOP/$KEY $NAME signed_$NAME + [ $QUIET ] || echo java -jar $OUT/../../../host/$OUT_TARGET_HOST/framework/signapk.jar $ANDROID_BUILD_TOP/$CERT $ANDROID_BUILD_TOP/$KEY $NAME signed_$NAME + java -jar $OUT/../../../host/$OUT_TARGET_HOST/framework/signapk.jar $ANDROID_BUILD_TOP/$CERT $ANDROID_BUILD_TOP/$KEY $NAME signed_$NAME [ $QUIET ] || echo "Zipalign.." zipalign -f 4 signed_$NAME $BASE/$1 if [ ! $QUIET ]; then diff --git a/tools/squisher b/tools/squisher index 552929ff..9a4b0bd5 100755 --- a/tools/squisher +++ b/tools/squisher @@ -88,7 +88,7 @@ echo printf "Signing package..." SECURITYDIR=$ANDROID_BUILD_TOP/build/target/product/security java -Xmx1024m \ - -jar $ANDROID_BUILD_TOP/out/host/$OUT_TARGET_HOST/framework/signapk.jar \ + -jar $OUT/../../../host/$OUT_TARGET_HOST/framework/signapk.jar \ -w $SECURITYDIR/testkey.x509.pem $SECURITYDIR/testkey.pk8 \ $REPACK/update.zip $OUTFILE echo