utils/aosp-merge.sh

#!/bin/bash
#
# Copyright (C) 2016 OmniROM Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
echo -e "Enter the AOSP ref to merge"
read ref

branch_name=${ref}"-merge"
# echo $branch_name

cd ../../../

while read path;
    do

    project=`echo android_${path} | sed -e 's/\//\_/g'`
    if [ "${project}" == "android_build_make" ] ; then
        project="android_build"
        buildpath="build"
    fi

    echo ""
    echo "====================================================================="
    echo " PROJECT: ${project} -> [ ${path}/ ]"
    echo ""

    cd $path;

    git merge --abort;

    repo sync -d .

    if git branch | grep ${branch_name} > /dev/null; then
        git branch -D ${branch_name} > /dev/null
    fi

    repo start ${branch_name} .
    if [ buildpath="build" ] ; then
        if ! git remote | grep "aosp" > /dev/null; then
            git remote add aosp https://android.googlesource.com/platform/$buildpath > /dev/null
        fi
    else

        if ! git remote | grep "aosp" > /dev/null; then
            git remote add aosp https://android.googlesource.com/platform/$path > /dev/null
        fi
    fi

    git fetch --tags aosp

    #echo "====================================================================="
    #echo " Merging {$ref}"
    #echo "====================================================================="
    if [ buildpath="build" ] ; then
        git merge --squash $ref && git commit -m "Merge $ref";
    else
        git merge $ref;
    fi

    cd - > /dev/null

done < vendor/omni/utils/aosp-forked-list