summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2015-06-02 00:14:14 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2015-06-02 00:14:14 +0800
commitcd70bc87ab67466a46821c08e8ab939512eff98d (patch)
tree1cb03582fbdcba6f48de97db0b095eafe240c34c
parent2fe752dea9fe5653c2c1047d603db03d86207d6c (diff)
update to 5.1.1_r4
Change-Id: Ib4db06234e5d77fa57884bc3ba5dd3fd1c69fe56 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--test-lor_ice_lolly_mr12
-rw-r--r--test-lor_ice_lolly_mr1_base2
14 files changed, 14 insertions, 14 deletions
diff --git a/armv8-android-hikey-3.18 b/armv8-android-hikey-3.18
index 32955f9..b1522cd 100644
--- a/armv8-android-hikey-3.18
+++ b/armv8-android-hikey-3.18
@@ -1,5 +1,5 @@
MANIFEST_REPO=https://android.googlesource.com/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r3
+MANIFEST_BRANCH=android-5.1.1_r4
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 288dd91..9d8bb64 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_r3
+MANIFEST_BRANCH=android-5.1.1_r4
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 97df03d..c900427 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_r3
+MANIFEST_BRANCH=android-5.1.1_r4
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 d2d305a..65dbc34 100644
--- a/lcr-member-fvp
+++ b/lcr-member-fvp
@@ -1,5 +1,5 @@
MANIFEST_REPO=https://android.googlesource.com/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r3
+MANIFEST_BRANCH=android-5.1.1_r4
REPO_GROUPS="default,-non-default,fvp-armv8"
PATCHSETS=LOLLIPOP-MLCR-PATCHSET
LOCAL_MANIFEST=ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git
diff --git a/lcr-member-juno b/lcr-member-juno
index b11946b..247a965 100644
--- a/lcr-member-juno
+++ b/lcr-member-juno
@@ -1,5 +1,5 @@
MANIFEST_REPO=https://android.googlesource.com/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r3
+MANIFEST_BRANCH=android-5.1.1_r4
REPO_GROUPS="default,-device,-non-default,juno"
BUILD_FS_IMAGE=1
PATCHSETS=LOLLIPOP-MLCR-PATCHSET
diff --git a/lcr-member-vexpress b/lcr-member-vexpress
index 33f05a3..94e7e98 100644
--- a/lcr-member-vexpress
+++ b/lcr-member-vexpress
@@ -1,5 +1,5 @@
MANIFEST_REPO=https://android.googlesource.com/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r3
+MANIFEST_BRANCH=android-5.1.1_r4
LOCAL_MANIFEST=ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git
LOCAL_MANIFEST_BRANCH=lor_ice_lolly_mr1
REPO_GROUPS="default,-device,-non-default,vexpress"
diff --git a/lcr-reference-fvp b/lcr-reference-fvp
index b422a1f..c0eaa5f 100644
--- a/lcr-reference-fvp
+++ b/lcr-reference-fvp
@@ -1,5 +1,5 @@
MANIFEST_REPO=https://android.googlesource.com/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r3
+MANIFEST_BRANCH=android-5.1.1_r4
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 f4dcbd7..aaafb33 100644
--- a/lcr-reference-juno
+++ b/lcr-reference-juno
@@ -1,5 +1,5 @@
MANIFEST_REPO=https://android.googlesource.com/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r3
+MANIFEST_BRANCH=android-5.1.1_r4
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 5039077..11e08c3 100644
--- a/lcr-reference-vexpress
+++ b/lcr-reference-vexpress
@@ -1,5 +1,5 @@
MANIFEST_REPO=https://android.googlesource.com/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r3
+MANIFEST_BRANCH=android-5.1.1_r4
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 7f00532..d52b3b0 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_r3
+MANIFEST_BRANCH=android-5.1.1_r4
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 7eb2a64..b35bee3 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_r3
+MANIFEST_BRANCH=android-5.1.1_r4
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 5ae332d..56bfdb0 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_r3
+MANIFEST_BRANCH=android-5.1.1_r4
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/test-lor_ice_lolly_mr1 b/test-lor_ice_lolly_mr1
index 363375b..4545ede 100644
--- a/test-lor_ice_lolly_mr1
+++ b/test-lor_ice_lolly_mr1
@@ -1,5 +1,5 @@
MANIFEST_REPO=https://android.googlesource.com/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r3
+MANIFEST_BRANCH=android-5.1.1_r4
REPO_GROUPS="default,-device,-non-default,juno"
BUILD_FS_IMAGE=1
PATCHSETS=LOLLIPOP-MLCR-PATCHSET
diff --git a/test-lor_ice_lolly_mr1_base b/test-lor_ice_lolly_mr1_base
index 4ab5697..4e591f6 100644
--- a/test-lor_ice_lolly_mr1_base
+++ b/test-lor_ice_lolly_mr1_base
@@ -1,5 +1,5 @@
MANIFEST_REPO=https://android.googlesource.com/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r3
+MANIFEST_BRANCH=android-5.1.1_r4
REPO_GROUPS="default,-device,-non-default,juno"
BUILD_FS_IMAGE=1
PATCHSETS=LOLLIPOP-MLCR-PATCHSET