summaryrefslogtreecommitdiff
path: root/default.xml
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-09-10 10:46:12 +0000
committerGerrit Code Review <gerrit@betelgeuse.canonical.com>2012-09-10 10:46:12 +0000
commitf5836012b8b5865dbe24ff284e7e0e019ff0ce56 (patch)
treeb3e91ae30853cbdaddbaee801bb474a34ea965b2 /default.xml
parentc3f1311256df7cfd04681f33d9fff52d85736ac7 (diff)
parente3e02cfda6404c17d5112dfd1cdf4c527bad6114 (diff)
Merge "manifest: (All) Use Linaro branch of LegacyCamera" into linaro_android_4.1.1
Diffstat (limited to 'default.xml')
-rw-r--r--default.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/default.xml b/default.xml
index aea0ac1..5a58951 100644
--- a/default.xml
+++ b/default.xml
@@ -138,6 +138,8 @@
<!-- Linaro modification: Add workaround for aliasing violation -->
<project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
<project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.1" />
+ <!-- Linaro modification: ISO C++ 11 support -->
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.1.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -315,7 +317,6 @@
<project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" />
<project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" />
<project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" />
<project path="packages/apps/Mms" name="platform/packages/apps/Mms" />
<project path="packages/apps/Music" name="platform/packages/apps/Music" />
<project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" />