From 45ebb8df55db5ce3df49f0a14ec80a49555d89ac Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Wed, 15 Aug 2012 23:05:24 +0200
Subject: manifests: (All) Use Linaro version of skia

Fixes aliasing violations and ISO C++ 11

Change-Id: I3ba26762c8ea2984aec3d4326683be3e5f64d75b
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 staging-galaxynexus.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'staging-galaxynexus.xml')

diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 6c61570..1b89eea 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -102,10 +102,11 @@
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="refs/tags/android-4.1.1_r4"/>
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" />
+  <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Need porting -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="refs/tags/android-4.1.1_r4" />
   <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.1.1_r4" />
-  <project path="external/skia" name="platform/external/skia" revision="refs/tags/android-4.1.1_r4" />
   <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="refs/tags/android-4.1.1_r4" />
   <project path="cts" name="platform/cts" revision="refs/tags/android-4.1.1_r4" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.1.1_r4" />
-- 
cgit v1.2.3