Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c10f6d56 authored by Chirayu Desai's avatar Chirayu Desai Committed by Gerrit Code Review
Browse files

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
parent 775057c9

tools/opticharger

+2 −2
Original line number Diff line number Diff line
@@ -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

tools/squisher

+1 −1
Original line number Diff line number Diff line
@@ -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