summaryrefslogtreecommitdiff
authorHelio Chissini de Castro <helio.chissini.de.castro@collabora.co.uk>2012-08-17 14:45:24 (GMT)
committer Helio Chissini de Castro <helio.chissini.de.castro@collabora.co.uk>2012-08-17 14:45:24 (GMT)
commit3adbb5d0308f1b2ea44a8f16d40476664d64b602 (patch) (side-by-side diff)
tree11d8d509976874c86037b331204a3735eef84d12
parent86b2e207f5a264cad5defceb271f8c00ecf4418a (diff)
downloadmanifest-3adbb5d0308f1b2ea44a8f16d40476664d64b602.tar.gz
manifest-3adbb5d0308f1b2ea44a8f16d40476664d64b602.tar.bz2
- glib and iconv moved back to gstreamer aggregate
- Config is now an topdir Android.mk file to make NDK life easier. Made in agreement of Reynaldo, me and Pekka
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--default.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/default.xml b/default.xml
index 17c558d..b101a07 100644
--- a/default.xml
+++ b/default.xml
@@ -7,10 +7,8 @@
<default revision="master" remote="ccu" sync-j="4" />
<!-- Collabora own entries on defaults -->
- <project path="external/collabora/config" name="platform/external/collabora/config" />
- <project path="external/collabora/glib" name="platform/external/collabora/glib" />
+ <project path="external/collabora/config" name="platform/external/collabora" />
<project path="external/collabora/libffi" name="platform/external/collabora/libffi" />
- <project path="external/collabora/libiconv" name="platform/external/collabora/libiconv" />
<project path="external/collabora/pc-files" name="platform/external/collabora/android-pc-files" />
<project path="external/androgenizer" name="androgenizer" />