summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2015-05-15 17:44:53 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2015-05-15 11:00:39 +0100
commit9dfcfad3e1ff6597c2c991b83db96c2b4f835b02 (patch)
tree55e914eda9c1533d031ab5a109b2382d78c81a05
parent689f06740b5b47f9a2b7e7f87c42ba002f943fd2 (diff)
update to use android-5.1.1_r2
Change-Id: I2dd12f0a69ffe23f6411a6bf10fae40d837d38fa Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rw-r--r--armv8-android-hikey-3.182
-rw-r--r--armv8-lsk2
-rw-r--r--armv8-lsk-3.142
-rw-r--r--lcr-member-fvp2
-rw-r--r--lcr-member-juno2
-rw-r--r--lcr-member-vexpress2
-rw-r--r--lcr-reference-fvp2
-rw-r--r--lcr-reference-juno2
-rw-r--r--lcr-reference-vexpress2
-rw-r--r--nexus10-linaro2
-rw-r--r--nexus7-2013-linaro2
-rw-r--r--nexus7-5.0-gcc49-linaro2
-rw-r--r--premerge-ci/armv8-android-fvp-lsk2
-rw-r--r--premerge-ci/armv8-android-juno-lsk2
-rw-r--r--premerge-ci/vexpress-lcr2
-rw-r--r--vexpress-lsk-3.142
16 files changed, 16 insertions, 16 deletions
diff --git a/armv8-android-hikey-3.18 b/armv8-android-hikey-3.18
index 1f386a5..db50821 100644
--- a/armv8-android-hikey-3.18
+++ b/armv8-android-hikey-3.18
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
LOCAL_MANIFEST=https://github.com/96boards/android_manifest
LOCAL_MANIFEST_BRANCH=android-5.0
REPO_GROUPS="default,-device,-non-default,hikey"
diff --git a/armv8-lsk b/armv8-lsk
index 218d71a..c2d9109 100644
--- a/armv8-lsk
+++ b/armv8-lsk
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
REPO_GROUPS="default,-non-default,-device,vexpress"
TARGET_KERNEL_SOURCE=kernel/linaro/vexpress
#PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
diff --git a/armv8-lsk-3.14 b/armv8-lsk-3.14
index fb7261b..dc37473 100644
--- a/armv8-lsk-3.14
+++ b/armv8-lsk-3.14
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
REPO_GROUPS="default,-non-default,-device,vexpress"
TARGET_KERNEL_SOURCE=kernel/linaro/vexpress
MAKE_TARGETS="selinuxtarballs"
diff --git a/lcr-member-fvp b/lcr-member-fvp
index 5a1ec47..adbfe6d 100644
--- a/lcr-member-fvp
+++ b/lcr-member-fvp
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
REPO_GROUPS="default,-non-default,fvp-armv8"
PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
diff --git a/lcr-member-juno b/lcr-member-juno
index d21c51d..abc7b57 100644
--- a/lcr-member-juno
+++ b/lcr-member-juno
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
REPO_GROUPS="default,-device,-non-default,juno"
BUILD_FS_IMAGE=1
PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
diff --git a/lcr-member-vexpress b/lcr-member-vexpress
index b05239e..34d6588 100644
--- a/lcr-member-vexpress
+++ b/lcr-member-vexpress
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0_toolchains
REPO_GROUPS="default,-device,-non-default,vexpress"
diff --git a/lcr-reference-fvp b/lcr-reference-fvp
index 5a1ec47..adbfe6d 100644
--- a/lcr-reference-fvp
+++ b/lcr-reference-fvp
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
REPO_GROUPS="default,-non-default,fvp-armv8"
PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
diff --git a/lcr-reference-juno b/lcr-reference-juno
index d21c51d..abc7b57 100644
--- a/lcr-reference-juno
+++ b/lcr-reference-juno
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
REPO_GROUPS="default,-device,-non-default,juno"
BUILD_FS_IMAGE=1
PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
diff --git a/lcr-reference-vexpress b/lcr-reference-vexpress
index b05239e..34d6588 100644
--- a/lcr-reference-vexpress
+++ b/lcr-reference-vexpress
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0_toolchains
REPO_GROUPS="default,-device,-non-default,vexpress"
diff --git a/nexus10-linaro b/nexus10-linaro
index a71be4c..aef882f 100644
--- a/nexus10-linaro
+++ b/nexus10-linaro
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
USE_JAVA_7=true
MANIFEST_FILENAME=default.xml
SOURCE_OVERLAY="manta/android-5.0/build-info.tar.bz2"
diff --git a/nexus7-2013-linaro b/nexus7-2013-linaro
index cb5cf46..69f3804 100644
--- a/nexus7-2013-linaro
+++ b/nexus7-2013-linaro
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
USE_JAVA_7=true
MANIFEST_FILENAME=default.xml
REPO_GROUPS="default,-device,-non-default,flo"
diff --git a/nexus7-5.0-gcc49-linaro b/nexus7-5.0-gcc49-linaro
index 0aa5660..32fc803 100644
--- a/nexus7-5.0-gcc49-linaro
+++ b/nexus7-5.0-gcc49-linaro
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0_toolchains
USE_JAVA_7=true
diff --git a/premerge-ci/armv8-android-fvp-lsk b/premerge-ci/armv8-android-fvp-lsk
index 5a1ec47..adbfe6d 100644
--- a/premerge-ci/armv8-android-fvp-lsk
+++ b/premerge-ci/armv8-android-fvp-lsk
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
REPO_GROUPS="default,-non-default,fvp-armv8"
PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
diff --git a/premerge-ci/armv8-android-juno-lsk b/premerge-ci/armv8-android-juno-lsk
index b46168b..90d3697 100644
--- a/premerge-ci/armv8-android-juno-lsk
+++ b/premerge-ci/armv8-android-juno-lsk
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
REPO_GROUPS="default,-device,-non-default,juno"
BUILD_FS_IMAGE=1
PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
diff --git a/premerge-ci/vexpress-lcr b/premerge-ci/vexpress-lcr
index 2e8441c..426c14b 100644
--- a/premerge-ci/vexpress-lcr
+++ b/premerge-ci/vexpress-lcr
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0_toolchains
REPO_GROUPS="default,-device,-non-default,vexpress"
diff --git a/vexpress-lsk-3.14 b/vexpress-lsk-3.14
index 60f2f8c..647f6fd 100644
--- a/vexpress-lsk-3.14
+++ b/vexpress-lsk-3.14
@@ -1,5 +1,5 @@
MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r1
+MANIFEST_BRANCH=android-5.1.1_r2
LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0_lsk-3.14
REPO_GROUPS="default,-device,-non-default,vexpress"