BlissRoms Initial
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
diff --git a/build/envsetup.sh b/build/envsetup.sh
index b73acf8..6b9b6a1 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -1,16 +1,16 @@
-function __print_lineage_functions_help() {
+function __print_bliss_functions_help() {
cat <<EOF
-Additional LineageOS functions:
+Additional Bliss functions:
- cout: Changes directory to out.
- mmp: Builds all of the modules in the current directory and pushes them to the device.
- mmap: Builds all of the modules in the current directory and its dependencies, then pushes the package to the device.
- mmmp: Builds all of the modules in the supplied directories and pushes them to the device.
-- lineagegerrit: A Git wrapper that fetches/pushes patch from/to LineageOS Gerrit Review.
-- lineagerebase: Rebase a Gerrit change and push it again.
-- lineageremote: Add git remote for LineageOS Gerrit Review.
+- blissgerrit: A Git wrapper that fetches/pushes patch from/to BlissRoms Gerrit Review.
+- blissrebase: Rebase a Gerrit change and push it again.
+- blissremote: Add git remote for BlissRoms Gerrit Review.
- aospremote: Add git remote for matching AOSP repository.
- cafremote: Add git remote for matching CodeAurora repository.
-- githubremote: Add git remote for LineageOS Github.
+- githubremote: Add git remote for BlissRoms Github.
- mka: Builds using SCHED_BATCH on all processors.
- mkap: Builds the module(s) using mka and pushes them to the device.
- cmka: Cleans and builds using mka.
@@ -78,12 +78,12 @@
# A buildtype was specified, assume a full device name
lunch $target
else
- # This is probably just the Lineage model name
+ # This is probably just the Bliss model name
if [ -z "$variant" ]; then
variant="userdebug"
fi
- lunch lineage_$target-$variant
+ lunch bliss_$target-$variant
fi
fi
return $?
@@ -94,7 +94,7 @@
function eat()
{
if [ "$OUT" ] ; then
- ZIPPATH=`ls -tr "$OUT"/lineage-*.zip | tail -1`
+ ZIPPATH=`ls -tr "$OUT"/Bliss-*.zip | tail -1`
if [ ! -f $ZIPPATH ] ; then
echo "Nothing to eat"
return 1
@@ -108,7 +108,7 @@
done
echo "Device Found.."
fi
- if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD"); then
+ if (adb shell getprop ro.bliss.device | grep -q "$BLISS_BUILD"); then
# if adbd isn't root we can't write to /cache/recovery/
adb root
sleep 1
@@ -124,7 +124,7 @@
fi
rm /tmp/command
else
- echo "The connected device does not appear to be $LINEAGE_BUILD, run away!"
+ echo "The connected device does not appear to be $BLISS_BUILD, run away!"
fi
return $?
else
@@ -248,36 +248,36 @@
fi
}
-function lineageremote()
+function blissremote()
{
if ! git rev-parse --git-dir &> /dev/null
then
echo ".git directory not found. Please run this from the root directory of the Android repository you wish to set up."
return 1
fi
- git remote rm lineage 2> /dev/null
+ git remote rm bliss 2> /dev/null
local REMOTE=$(git config --get remote.github.projectname)
- local LINEAGE="true"
+ local BLISS="true"
if [ -z "$REMOTE" ]
then
REMOTE=$(git config --get remote.aosp.projectname)
- LINEAGE="false"
+ BLISS="false"
fi
if [ -z "$REMOTE" ]
then
REMOTE=$(git config --get remote.caf.projectname)
- LINEAGE="false"
+ BLISS="false"
fi
- if [ $LINEAGE = "false" ]
+ if [ $BLISS = "false" ]
then
local PROJECT=$(echo $REMOTE | sed -e "s#platform/#android/#g; s#/#_#g")
- local PFX="LineageOS/"
+ local PFX="BlissRoms/"
else
local PROJECT=$REMOTE
fi
- local LINEAGE_USER=$(git config --get review.review.lineageos.org.username)
+ local BLISS_USER=$(git config --get review.review.lineageos.org.username)
if [ -z "$LINEAGE_USER" ]
then
git remote add lineage ssh://review.lineageos.org:29418/$PFX$PROJECT
@@ -352,7 +352,7 @@
local PROJECT=$(echo $REMOTE | sed -e "s#platform/#android/#g; s#/#_#g")
- git remote add github https://github.com/LineageOS/$PROJECT
+ git remote add github https://github.com/BlissRoms/$PROJECT
echo "Remote 'github' created"
}
@@ -386,7 +386,7 @@
sleep 1
adb wait-for-online shell mount /system 2>&1 > /dev/null
adb wait-for-online remount
- if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD");
+ if (adb shell getprop ro.bliss.device | grep -q "$BLISS_BUILD");
then
adb push $OUT/boot.img /cache/
if [ -e "$OUT/system/lib/modules/*" ];
@@ -401,7 +401,7 @@
adb shell rm -rf /cache/boot.img
echo "Installation complete."
else
- echo "The connected device does not appear to be $LINEAGE_BUILD, run away!"
+ echo "The connected device does not appear to be $BLISS_BUILD, run away!"
fi
}
@@ -435,14 +435,14 @@
sleep 1
adb wait-for-online shell mount /system 2>&1 >> /dev/null
adb wait-for-online remount
- if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD");
+ if (adb shell getprop ro.bliss.device | grep -q "$BLISS_BUILD");
then
adb push $OUT/recovery.img /cache/
adb shell dd if=/cache/recovery.img of=$PARTITION
adb shell rm -rf /cache/recovery.img
echo "Installation complete."
else
- echo "The connected device does not appear to be $LINEAGE_BUILD, run away!"
+ echo "The connected device does not appear to be $BLISS_BUILD, run away!"
fi
}
@@ -462,13 +462,13 @@
if [ "$REPO_REMOTE" = "github" ]
then
pwd
- lineageremote
- git push lineage HEAD:refs/heads/'$1'
+ blissremote
+ git push bliss HEAD:refs/heads/'$1'
fi
'
}
-function lineagegerrit() {
+function blissgerrit() {
if [ "$(__detect_shell)" = "zsh" ]; then
# zsh does not define FUNCNAME, derive from funcstack
local FUNCNAME=$funcstack[1]
@@ -706,7 +706,7 @@
esac
}
-function lineagerebase() {
+function blissrebase() {
local repo=$1
local refs=$2
local pwd="$(pwd)"
@@ -820,7 +820,7 @@
echo "Device Found."
fi
- if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD") || [ "$FORCE_PUSH" = "true" ];
+ if (adb shell getprop ro.bliss.device | grep -q "$BLISS_BUILD") || [ "$FORCE_PUSH" = "true" ];
then
# retrieve IP and PORT info if we're using a TCP connection
TCPIPPORT=$(adb devices \
@@ -938,7 +938,7 @@
rm -f $OUT/.log
return 0
else
- echo "The connected device does not appear to be $LINEAGE_BUILD, run away!"
+ echo "The connected device does not appear to be $BLISS_BUILD, run away!"
fi
}
@@ -951,14 +951,14 @@
function repopick() {
T=$(gettop)
- $T/vendor/lineage/build/tools/repopick.py $@
+ $T/vendor/bliss/build/tools/repopick.py $@
}
function fixup_common_out_dir() {
common_out_dir=$(get_build_var OUT_DIR)/target/common
target_device=$(get_build_var TARGET_DEVICE)
common_target_out=common-${target_device}
- if [ ! -z $LINEAGE_FIXUP_COMMON_OUT ]; then
+ if [ ! -z $BLISS_FIXUP_COMMON_OUT ]; then
if [ -d ${common_out_dir} ] && [ ! -L ${common_out_dir} ]; then
mv ${common_out_dir} ${common_out_dir}-${target_device}
ln -s ${common_target_out} ${common_out_dir}
@@ -972,3 +972,8 @@
mkdir -p ${common_out_dir}
fi
}
+
+# Android specific JACK args
+if [ -n "$JACK_SERVER_VM_ARGUMENTS" ] && [ -z "$ANDROID_JACK_VM_ARGS" ]; then
+ export ANDROID_JACK_VM_ARGS=$JACK_SERVER_VM_ARGUMENTS
+fi