summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2014-07-21 19:21:34 +0200
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2014-07-21 19:21:34 +0200
commit77ef6b9a5062edf2452f28843d74a294ba2062c3 (patch)
treeb78bd0f73a8e994c0591a2bbb3af1be4191dd9f1
parent717b72610669ce5ff7795eefe3f1c1618d3e233f (diff)
downloadmanifest-77ef6b9a5062edf2452f28843d74a294ba2062c3.tar.gz
Re-add busybox
Re-add busybox now that it builds again Change-Id: If17c1329827f36b6e48fbd5fa789fc9393a8e6c1 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--baseline_manifest.xml2
-rw-r--r--default.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/baseline_manifest.xml b/baseline_manifest.xml
index 4cf1e0fa5..bc01b9825 100644
--- a/baseline_manifest.xml
+++ b/baseline_manifest.xml
@@ -20,7 +20,7 @@
<project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro" revision="master" remote="linaro-android"/>
<project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro" revision="master" remote="linaro-android"/>
<!-- Linaro Tests -->
- <!-- project path="external/busybox" name="platform/external/busybox" revision="linaro-1.21-master-20140515" remote="linaro-android"/ -->
+ <project path="external/busybox" name="platform/external/busybox" revision="linaro-1.21" remote="linaro-android"/>
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" revision="linaro-master" remote="linaro-android"/>
<project path="external/linaro-android-kernel-test" name="platform/external/linaro-android-kernel-test" revision="linaro-juice-master-20140514" remote="linaro-android"/>
<project path="external/linaro-android-userspace-test" name="platform/external/linaro-android-userspace-test" remote="linaro-android"/>
diff --git a/default.xml b/default.xml
index 58f48c555..2cd5c013d 100644
--- a/default.xml
+++ b/default.xml
@@ -21,7 +21,7 @@
<project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro" remote="linaro-android" revision="master"/>
<project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro" remote="linaro-android" revision="master"/>
<!-- Linaro Tests -->
- <!-- project path="external/busybox" name="platform/external/busybox" revision="linaro-1.21-master-20140515" remote="linaro-android"/ -->
+ <project path="external/busybox" name="platform/external/busybox" revision="linaro-1.21" remote="linaro-android"/>
<project path="packages/apps/0xbench" name="platform/packages/apps/0xbench" remote="linaro-android" revision="linaro-master"/>
<project path="external/linaro-android-kernel-test" name="platform/external/linaro-android-kernel-test" remote="linaro-android" revision="linaro-juice-master-20140514"/>