diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2016-01-19 02:42:34 +0000 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2016-01-19 02:43:30 +0000 |
| commit | db810129b8a32b8f8fb5132ac4da5a8193cf9761 (patch) | |
| tree | bd735d7d90c30c9fb4c03e38b4860caae4d472ef | |
| parent | 54ff4b4be83521c8cb989d4bf7253a04abaa376e (diff) | |
update tag and support for liuyq.xml
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | liuyq-patches/liuyq.xml | 2 | ||||
| -rwxr-xr-x | scripts-common/sync-common.sh | 7 | ||||
| -rwxr-xr-x | sync-marshmallow-linaro.sh | 8 | ||||
| -rwxr-xr-x | sync-marshmallow-local-private.sh | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/liuyq-patches/liuyq.xml b/liuyq-patches/liuyq.xml index c671ebe..e06cc34 100644 --- a/liuyq-patches/liuyq.xml +++ b/liuyq-patches/liuyq.xml @@ -7,8 +7,8 @@ <project path="packages/inputmethods/hackerskeyboard" name="liuyq/hackerskeyboard" revision="master" remote="github4liuyq"/> <!-- <project path="external/opencv-upstream" name="Itseez/opencv" revision="master" remote="github4liuyq" /> ---> <project path="external/ncurses" name="platform/external/ncurses" revision="linaro" groups="common" remote="linaro-android"/> +--> <project path="external/opencv-upstream" name="liuyq/opencv" revision="master" remote="github4liuyq" /> <project path="android-tools/apks" name="liuyq/apks" revision="master" remote="github4liuyq" /> diff --git a/scripts-common/sync-common.sh b/scripts-common/sync-common.sh index 5698e88..5f442f3 100755 --- a/scripts-common/sync-common.sh +++ b/scripts-common/sync-common.sh @@ -80,9 +80,10 @@ sync_linaro(){ cd ${BASE} cp -uvf liuyq-patches/liuyq.xml .repo/local_manifests/liuyq.xml - if [ -d android-patchsets ]; then - cp -uvf liuyq-patches/LIUYQ-PATCHSET android-patchsets + if [ ! -d android-patchsets ]; then + mkdir -p android-patchsets fi + cp -uvf liuyq-patches/LIUYQ-PATCHSET android-patchsets juno_mali_binary hikey_mali_binary } @@ -109,9 +110,9 @@ main(){ # update myself first git pull parseArgs "$@" - sync_init if $sync_linaro; then sync_linaro fi + sync_init sync } diff --git a/sync-marshmallow-linaro.sh b/sync-marshmallow-linaro.sh index 51f7279..dad5341 100755 --- a/sync-marshmallow-linaro.sh +++ b/sync-marshmallow-linaro.sh @@ -4,7 +4,7 @@ export BASE=$(cd $(dirname $0);pwd) source ${BASE}/scripts-common/sync-common.sh export MIRROR="http://android.git.linaro.org/git/platform/manifest.git" -branch="android-6.0.1_r3" +branch="android-6.0.1_r10" LOCAL_MANIFEST="ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git" LOCAL_MANIFEST_BRANCH="linaro-marshmallow" @@ -22,9 +22,9 @@ ${BASE}/sync-projects.sh build \ ./android-patchsets/juno-m-workarounds ./android-patchsets/marshmallow-gcc5-patchset -#./android-patchsets/nexus9-workarounds -cp host-tools/LOLLIPOP-LIUYQ-PATCHSET ./android-patchsets/LOLLIPOP-LIUYQ-PATCHSET -./android-patchsets/LOLLIPOP-LIUYQ-PATCHSET +cd device/linaro/build +git fetch ssh://yongqin.liu@android-review.linaro.org:29418/device/linaro/common refs/changes/39/16439/1 && git cherry-pick FETCH_HEAD +cd ../../../ #./build.sh exit diff --git a/sync-marshmallow-local-private.sh b/sync-marshmallow-local-private.sh index 1f85a7b..5618943 100755 --- a/sync-marshmallow-local-private.sh +++ b/sync-marshmallow-local-private.sh @@ -4,7 +4,7 @@ export BASE=$(cd $(dirname $0);pwd) source ${BASE}/scripts-common/sync-common.sh export MIRROR="/SATA3/aosp-mirror/platform/manifest.git" -branch="android-6.0.1_r3" +branch="android-6.0.1_r10" LOCAL_MANIFEST="ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git" LOCAL_MANIFEST_BRANCH="linaro-marshmallow" |