@@ -78,13 +78,13 @@ function check_product()
7878 return
7979 fi
8080
81- if (echo -n $1 | grep -q -e " ^slim_ " ; then
82- SLIM_BUILD =$( echo -n $1 | sed -e ' s/^slim_ //g' )
83- export BUILD_NUMBER=$(( date +% s% N ; echo $SLIM_BUILD ; hostname) | openssl sha1 | sed - e 's/ .*=// g; s/ // g' | cut - c1 - 10 )
81+ if (echo -n $1 | grep -q -e " ^aospb_ " ; then
82+ AOSPB_BUILD =$( echo -n $1 | sed -e ' s/^aospb_ //g' )
83+ export BUILD_NUMBER=$(( date +% s% N ; echo $AOSPB_BUILD ; hostname) | openssl sha1 | sed - e 's/ .*=// g; s/ // g' | cut - c1 - 10 )
8484 else
85- SLIM_BUILD =
85+ AOSPB_BUILD =
8686 fi
87- export SLIM_BUILD
87+ export AOSPB_BUILD
8888
8989 TARGET_PRODUCT=$1 \
9090 TARGET_BUILD_VARIANT= \
@@ -506,7 +506,7 @@ function print_lunch_menu()
506506 echo " (ohai, koush!)"
507507 fi
508508 echo
509- if [ " z${SLIM_DEVICES_ONLY } " != " z" ; then
509+ if [ " z${AOSPB_DEVICES_ONLY } " != " z" ; then
510510 echo " Breakfast menu... pick a combo:"
511511 else
512512 echo " Lunch menu... pick a combo:"
@@ -520,7 +520,7 @@ function print_lunch_menu()
520520 i=$(( $i + 1 ))
521521 done | column
522522
523- if [ " z${SLIM_DEVICES_ONLY } " != " z" ; then
523+ if [ " z${AOSPB_DEVICES_ONLY } " != " z" ; then
524524 echo " ... and don't forget the bacon!"
525525 fi
526526
@@ -549,10 +549,10 @@ function breakfast()
549549{
550550 target=$1
551551 local variant=$2
552- SLIM_DEVICES_ONLY =" true"
552+ AOSPB_DEVICES_ONLY =" true"
553553 unset LUNCH_MENU_CHOICES
554554 add_lunch_combo full-eng
555- for f in ` /bin/ls vendor/slim /vendorsetup.sh 2> /dev/null`
555+ for f in ` /bin/ls vendor/aospb /vendorsetup.sh 2> /dev/null`
556556 do
557557 echo " including $f "
558558 . $f
@@ -568,11 +568,11 @@ function breakfast()
568568 # A buildtype was specified, assume a full device name
569569 lunch $target
570570 else
571- # This is probably just the SLIM model name
571+ # This is probably just the AOSPB model name
572572 if [ -z " $variant " ; then
573573 variant=" userdebug"
574574 fi
575- lunch slim_ $target -$variant
575+ lunch aospb_ $target -$variant
576576 fi
577577 fi
578578 return $?
@@ -622,7 +622,7 @@ function lunch()
622622 check_product $product
623623 if [ $? -ne 0 ]
624624 then
625- # if we can't find a product, try to grab it off the SLIM github
625+ # if we can't find a product, try to grab it off the AOSPB github
626626 T=$( gettop)
627627 pushd $T > /dev/null
628628 build/tools/roomservice.py $product
@@ -734,7 +734,7 @@ function tapas()
734734function eat()
735735{
736736 if [ " $OUT " ; then
737- MODVERSION=$( get_build_var SLIM_VERSION )
737+ MODVERSION=$( get_build_var AOSPB_VERSION )
738738 ZIPFILE=$MODVERSION .zip
739739 ZIPPATH=$OUT /$ZIPFILE
740740 if [ ! -f $ZIPPATH ] ; then
@@ -750,7 +750,7 @@ function eat()
750750 done
751751 echo " Device Found.."
752752 fi
753- if (adb shell getprop ro.slim .device | grep -q " $SLIM_BUILD " ;
753+ if (adb shell getprop ro.aospb .device | grep -q " $AOSPB_BUILD " ;
754754 then
755755 # if adbd isn't root we can't write to /cache/recovery/
756756 adb root
772772 fi
773773 return $?
774774 else
775- echo " The connected device does not appear to be $SLIM_BUILD , run away!"
775+ echo " The connected device does not appear to be $AOSPB_BUILD , run away!"
776776 fi
777777}
778778
@@ -1751,7 +1751,7 @@ function repopick() {
17511751function fixup_common_out_dir() {
17521752 common_out_dir=$( get_build_var OUT_DIR)
17531753 target_device=$( get_build_var TARGET_DEVICE)
1754- if [ ! -z $SLIM_FIXUP_COMMON_OUT ]; then
1754+ if [ ! -z $AOSPB_FIXUP_COMMON_OUT ]; then
17551755 if [ -d ${common_out_dir} ] && [ ! -L ${common_out_dir} ]; then
17561756 mv ${common_out_dir} ${common_out_dir} -${target_device}
17571757 ln -s ${common_out_dir} -${target_device} ${common_out_dir}
@@ -1796,7 +1796,7 @@ function installboot()
17961796 sleep 1
17971797 adb wait-for-online shell mount /system 2>&1 > /dev/null
17981798 adb wait-for-online remount
1799- if (adb shell getprop ro.slim .device | grep -q " $SLIM_BUILD " ;
1799+ if (adb shell getprop ro.aospb .device | grep -q " $AOSPB_BUILD " ;
18001800 then
18011801 adb push $OUT /boot.img /cache/
18021802 for i in $OUT /system/lib/modules/* ;
@@ -1807,7 +1807,7 @@ function installboot()
18071807 adb shell chmod 644 /system/lib/modules/*
18081808 echo " Installation complete."
18091809 else
1810- echo " The connected device does not appear to be $SLIM_BUILD , run away!"
1810+ echo " The connected device does not appear to be $AOSPB_BUILD , run away!"
18111811 fi
18121812}
18131813
@@ -1841,13 +1841,13 @@ function installrecovery()
18411841 sleep 1
18421842 adb wait-for-online shell mount /system 2>&1 > /dev/null
18431843 adb wait-for-online remount
1844- if (adb shell getprop ro.slim .device | grep -q " $SLIM_BUILD " ;
1844+ if (adb shell getprop ro.aospb .device | grep -q " $AOSPB_BUILD " ;
18451845 then
18461846 adb push $OUT /recovery.img /cache/
18471847 adb shell dd if=/cache/recovery.img of=$PARTITION
18481848 echo " Installation complete."
18491849 else
1850- echo " The connected device does not appear to be $SLIM_BUILD , run away!"
1850+ echo " The connected device does not appear to be $AOSPB_BUILD , run away!"
18511851 fi
18521852}
18531853
@@ -1867,7 +1867,7 @@ function dopush()
18671867 echo " Device Found."
18681868 fi
18691869
1870- if (adb shell getprop ro.slim .device | grep -q " $SLIM_BUILD " || [ " $FORCE_PUSH " == " true" ;
1870+ if (adb shell getprop ro.aospb .device | grep -q " $AOSPB_BUILD " || [ " $FORCE_PUSH " == " true" ;
18711871 then
18721872 # retrieve IP and PORT info if we're using a TCP connection
18731873 TCPIPPORT=$( adb devices | egrep ' ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+[^0-9]+'
@@ -1971,7 +1971,7 @@ EOF
19711971 rm -f $OUT /.log
19721972 return 0
19731973 else
1974- echo " The connected device does not appear to be $SLIM_BUILD , run away!"
1974+ echo " The connected device does not appear to be $AOSPB_BUILD , run away!"
19751975 fi
19761976}
19771977
@@ -2095,7 +2095,7 @@ unset f
20952095
20962096# Add completions
20972097check_bash_version && {
2098- dirs=" sdk/bash_completion vendor/slim /bash_completion"
2098+ dirs=" sdk/bash_completion vendor/aospb /bash_completion"
20992099 for dir in $dirs ; do
21002100 if [ -d ${dir} ]; then
21012101 for f in ` /bin/ls ${dir} /[a-z]* .bash 2> /dev/null` ; do
0 commit comments