Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

system-extras: Commit

system/extras


Commit MetaInfo

Revision7f0f8ae8f1152a8be61c4b6011c2250b3f3ddff9 (tree)
Time2016-08-08 23:51:42
AuthorJaap Jan Meijer <jjmeijer88@gmai...>
CommiterJaap Jan Meijer

Log Message

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Conflicts:
ext4_utils/mkuserimg.sh

Change Summary

Incremental Difference

--- a/ext4_utils/mkuserimg.sh
+++ b/ext4_utils/mkuserimg.sh
@@ -90,10 +90,7 @@ if [ -z $SIZE ]; then
9090 exit 2
9191 elif [ 0 -eq 0$SIZE ]; then
9292 s=$(du -sm $SRC_DIR | cut -f1)
93- e=$(($s / 10))
94- echo $TARGET_PRODUCT | grep -q 64 && l=250 || l=130
95- [ $e -lt $l ] && e=$l
96- SIZE=$(($s + $e))M
93+ SIZE=$(($s / 10 + $s))M
9794 fi
9895
9996 OPT=""
Show on old repository browser