manifest: (All) Use Linaro version of libbcc

Use Linaro version of libbcc, removes duplicate definitions

Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

9 files changed, 9 insertions, 10 deletions

diff --git a/default.xml b/default.xml
index 45e155e01..aeab65306 100644
--- a/default.xml
+++ b/default.xml
@@ -79,6 +79,7 @@
   <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.3" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.3" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -197,7 +198,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
diff --git a/landing-panda.xml b/landing-panda.xml
index a40e54571..90b4099b4 100644
--- a/landing-panda.xml
+++ b/landing-panda.xml
@@ -81,6 +81,7 @@
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.3" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -202,7 +203,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index e615ca0a3..2efdc6f0d 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -83,6 +83,7 @@
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.3"/>
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -201,7 +202,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index 77b27b9ad..4290dd650 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -79,6 +79,7 @@
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.3"/>
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -197,7 +198,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
diff --git a/staging-iMX6.xml b/staging-iMX6.xml
index 13f4f6e29..c30a6cfc0 100644
--- a/staging-iMX6.xml
+++ b/staging-iMX6.xml
@@ -81,6 +81,7 @@
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.3"/>
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -199,7 +200,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
diff --git a/staging-origen.xml b/staging-origen.xml
index b061bd257..3434526fa 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -84,6 +84,7 @@
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.3"/>
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -202,7 +203,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 655f4b25e..7bd6d8cf5 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -78,6 +78,7 @@
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.3" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -196,7 +197,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
diff --git a/staging-vexpress-a9.xml b/staging-vexpress-a9.xml
index 58083c5bb..86a13c863 100644
--- a/staging-vexpress-a9.xml
+++ b/staging-vexpress-a9.xml
@@ -81,6 +81,7 @@
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.3"/>
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -199,7 +200,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 3878b0b5e..fb072f909 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -78,7 +78,7 @@
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/>
   <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" />
   <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" />
-
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.3"/>
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -197,7 +197,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />