summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2012-02-26 11:04:58 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2012-02-26 11:04:58 +0530
commitf35ac1929cdd5d2d1f088184acc47516be1e2d4a (patch)
tree4a393e8fd8fd821ee0fa4284e9ecd71570b843ed
parentb1c090b90d244d7388aef3f5496385ef6207d9f1 (diff)
downloadmanifest-f35ac1929cdd5d2d1f088184acc47516be1e2d4a.tar.gz
manifest: (All) Remove duplicate TI project
Change-Id: I0592363d51f352f0f4c489196786fb98a05b4cbe Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r--default.xml5
-rw-r--r--landing-panda.xml5
-rw-r--r--staging-origen.xml8
3 files changed, 6 insertions, 12 deletions
diff --git a/default.xml b/default.xml
index 271604cee..45e155e01 100644
--- a/default.xml
+++ b/default.xml
@@ -43,10 +43,6 @@
<!-- copyfile src="arch/arm/configs/panda_defconfig" dest="kernel/arch/arm/configs/android_omap4_defconfig" /-->
<!-- /project -->
- <!-- TI proprietary-open -->
- <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
- <project path="device/ti/uim" name="device/ti/uim" revision="android" />
-
<!-- AOSP with Linaro additions -->
<project path="build" name="platform/build" revision="linaro_android_4.0.3">
<copyfile src="core/root.mk" dest="Makefile" />
@@ -86,6 +82,7 @@
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
+ <project path="device/ti/uim" name="device/ti/uim" revision="android" />
<!-- AOSP -->
<project path="abi/cpp" name="platform/abi/cpp" />
diff --git a/landing-panda.xml b/landing-panda.xml
index 27d30ad68..a40e54571 100644
--- a/landing-panda.xml
+++ b/landing-panda.xml
@@ -48,10 +48,6 @@
<project path="hardware/ti/domx" name="platform/hardware/ti/domx" remote="omapzoom" revision="de6a50ad976304e8b32843edf3eee2d4e3ac9a89" />
- <!-- TI proprietary-open -->
- <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
- <project path="device/ti/uim" name="device/ti/uim" revision="android" />
-
<!-- AOSP with Linaro additions -->
<project path="build" name="platform/build" revision="linaro_android_4.0.3">
<copyfile src="core/root.mk" dest="Makefile" />
@@ -88,6 +84,7 @@
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
+ <project path="device/ti/uim" name="device/ti/uim" revision="android" />
<!-- AOSP -->
<project path="abi/cpp" name="platform/abi/cpp" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 13fb6d0a8..b061bd257 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -46,10 +46,6 @@
<!-- copyfile src="arch/arm/configs/panda_defconfig" dest="kernel/arch/arm/configs/android_omap4_defconfig" /-->
<!-- /project -->
- <!-- TI proprietary-open -->
- <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
- <project path="device/ti/uim" name="device/ti/uim" revision="android" />
-
<!-- AOSP with Linaro additions -->
<project path="build" name="platform/build" revision="linaro_android_4.0.3">
<copyfile src="core/root.mk" dest="Makefile" />
@@ -89,6 +85,10 @@
<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" />
+ <!-- TI proprietary-open -->
+ <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
+ <project path="device/ti/uim" name="device/ti/uim" revision="android" />
+
<!-- AOSP -->
<project path="abi/cpp" name="platform/abi/cpp" />
<project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />