diff options
| author | Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com> | 2013-12-18 19:38:52 +0400 |
|---|---|---|
| committer | Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com> | 2013-12-18 19:38:52 +0400 |
| commit | d0b3dbad8c9371b0d4177f29b024447daf884567 (patch) | |
| tree | ae41d860d1ffd3d4e7b76d578e34deb787b0350c | |
| parent | 74715f2e37d587d6553731f9b60b98e53276be67 (diff) | |
| download | idea-d0b3dbad8c9371b0d4177f29b024447daf884567.tar.gz | |
script for getting changes from aosp repository
| -rw-r--r-- | get_aosp_changes.sh | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/get_aosp_changes.sh b/get_aosp_changes.sh new file mode 100644 index 00000000000..b94793833ab --- /dev/null +++ b/get_aosp_changes.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +# The script accepts one parameter, which can be "init", "start" or "finish" +# Before first use run the script with "init" parameter +# To get the changes from AOSP repository do following: +# 1. Run the script with "start" parameter +# 2. Perform "pull" from AOSP remote for "android" and "tools-base" repositories using IntelliJ IDEA, +# resolve all conflicts, commit, check that everything is compiled correctly and the tests are passed +# 3. Run the script with "finish" parameter + +if [ "$1" = "init" ]; then + git remote add AOSP https://android.googlesource.com/platform/tools/adt/idea + cd tools-base + git remote add AOSP https://android.googlesource.com/platform/tools/base +elif [ "$1" = "start" ]; then + git branch -d android-tmp + git checkout -b android-tmp + cd tools-base + git branch -d android-tmp + git checkout -b android-tmp +elif [ "$1" = "finish" ]; then + git checkout master + git merge android-tmp + cd tools-base + git checkout master + git merge android-tmp +else + echo 'Unknown parameter' +fi
\ No newline at end of file |