diff options
author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-08-20 11:49:40 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@betelgeuse.canonical.com> | 2012-08-20 11:49:40 +0000 |
commit | fb4bccd88ad849e3b98d97510b84f410a76e3e62 (patch) | |
tree | a8ea1dc342492239cd15edb5155e70295a76add6 /default.xml | |
parent | 107cf088f8c515632a53a1071fdb34a00dcf0e0d (diff) | |
parent | d52be3743aaa14693eb82f4bbdad3a1ae6c95f6b (diff) |
Merge "manifests: (All) Use Linaro branch of embunit" into linaro_android_4.1.1
Diffstat (limited to 'default.xml')
-rw-r--r-- | default.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/default.xml b/default.xml index 2d318bf..03c97d6 100644 --- a/default.xml +++ b/default.xml @@ -112,6 +112,7 @@ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" /> <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.1.1" /> <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.1.1" /> + <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.1.1" /> <!-- Linaro modifications: need to be restored --> <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="refs/tags/android-4.1.1_r4"/> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="refs/tags/android-4.1.1_r4"/> @@ -132,7 +133,6 @@ <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ --> <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.1" /> <!-- Linaro modifications: need to be restored --> - <project path="external/embunit" name="platform/external/embunit" revision="refs/tags/android-4.1.1_r4" /> <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.1.1_r4" /> <!-- Linaro modifications: Made it build with OpenJDK --> <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" /> |