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

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

envsetup: add a helper to fix "out/target/common" not being really common 

* out/target/common isn't really common, and if you do
  back to back builds for multiple devices, that is noticable.
* Use out/target/common-$device instead, and link the appropriate
  dir to out/target/common every time lunch() is run, if
  CM_FIXUP_COMMON_OUT is set.
* Refer https://groups.google.com/forum/#!topic/android-building/ispbOgzoyg8
  for more info.

Change-Id: I11e7df0e68e2a60ce32576f06397d60fc9465b60
parent 42342f32

envsetup.sh

+20 −0
Original line number Diff line number Diff line
@@ -615,6 +615,8 @@ function lunch() 


    echo



    fixup_common_out_dir



    set_stuff_for_environment

    printconfig

}
@@ -1846,6 +1848,24 @@ function repopick() { 
    $T/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)

    if [ ! -z $CM_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_out_dir}-${target_device} ${common_out_dir}

        else

            [ -L ${common_out_dir} ] && rm ${common_out_dir}

            mkdir -p ${common_out_dir}-${target_device}

            ln -s ${common_out_dir}-${target_device} ${common_out_dir}

        fi

    else

        [ -L ${common_out_dir} ] && rm ${common_out_dir}

        mkdir -p ${common_out_dir}

    fi

}





# Force JAVA_HOME to point to java 1.6 if it isn't already set

function set_java_home() {