ADHOC/replicant-vendor_replicant
3
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

squisher: replace $ANDROID_BUILD_TOP

Browse Source 
Now uses $OUT/../../../host instead of $ANDROID_BUILD_TOP/out/host
fixes build when used with OUT_DIR_COMMON_BASE

Change-Id: Ib1934b57f3e94a3c3af10189c803fc494438a4a4
This commit is contained in:
Chirayu Desai 2012-08-11 16:34:32 +05:30 committed by Gerrit Code Review
parent 775057c98f
commit c10f6d5638
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/opticharger
View File

@ -135,8 +135,8 @@ then
[ $QUIET ] || echo "Resigning with cert: `echo $CERT`" [ $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 [ $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 $ANDROID_BUILD_TOP/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.." [ $QUIET ] || echo "Zipalign.."
zipalign -f 4 signed_$NAME $BASE/$1 zipalign -f 4 signed_$NAME $BASE/$1
if [ ! $QUIET ]; then if [ ! $QUIET ]; then

2
tools/squisher
View File

@ -88,7 +88,7 @@ echo
printf "Signing package..." printf "Signing package..."
SECURITYDIR=$ANDROID_BUILD_TOP/build/target/product/security SECURITYDIR=$ANDROID_BUILD_TOP/build/target/product/security
java -Xmx1024m \ 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 \ -w $SECURITYDIR/testkey.x509.pem $SECURITYDIR/testkey.pk8 \
$REPACK/update.zip $OUTFILE $REPACK/update.zip $OUTFILE
echo echo