diff options
-rw-r--r-- | default.xml | 3 | ||||
-rw-r--r-- | landing-snowball.xml | 3 | ||||
-rw-r--r-- | linaro-default.xml | 3 | ||||
-rw-r--r-- | staging-galaxynexus.xml | 3 | ||||
-rw-r--r-- | staging-origen.xml | 3 | ||||
-rw-r--r-- | staging-panda.xml | 3 | ||||
-rw-r--r-- | staging-vexpress-rtsm-isw.xml | 3 | ||||
-rw-r--r-- | staging-vexpress-rtsm.xml | 3 | ||||
-rw-r--r-- | staging-vexpress.xml | 3 | ||||
-rw-r--r-- | tracking-panda.xml | 3 | ||||
-rw-r--r-- | tracking-vexpress.xml | 3 |
11 files changed, 22 insertions, 11 deletions
diff --git a/default.xml b/default.xml index 79416ca..3c0fa44 100644 --- a/default.xml +++ b/default.xml @@ -110,9 +110,10 @@ <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/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" /> diff --git a/landing-snowball.xml b/landing-snowball.xml index d24c372..af265df 100644 --- a/landing-snowball.xml +++ b/landing-snowball.xml @@ -94,6 +94,8 @@ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" /> <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc --> <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.1" /> + <!-- 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: Find omapfb.h --> <!-- FIXME The 4.0.4 branch has further changes that may need porting --> <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.1" /> @@ -121,7 +123,6 @@ <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> <project path="external/tremolo" name="platform/external/tremolo" /> - <project path="external/skia" name="platform/external/skia" /> <project path="packages/apps/Settings" name="platform/packages/apps/Settings" /> <project path="cts" name="platform/cts" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" /> diff --git a/linaro-default.xml b/linaro-default.xml index 083f89c..6b16bae 100644 --- a/linaro-default.xml +++ b/linaro-default.xml @@ -120,7 +120,6 @@ <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> <project path="external/tremolo" name="platform/external/tremolo" /> - <project path="external/skia" name="platform/external/skia" /> <project path="packages/apps/Settings" name="platform/packages/apps/Settings" /> <project path="cts" name="platform/cts" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" /> @@ -140,6 +139,8 @@ <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/> <!-- 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" /> + <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support --> + <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> 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" /> diff --git a/staging-origen.xml b/staging-origen.xml index 6714ac7..13c0edb 100644 --- a/staging-origen.xml +++ b/staging-origen.xml @@ -117,10 +117,11 @@ <project path="external/llvm" name="platform/external/llvm" /> <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" /> <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" /> + <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support --> + <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" /> <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> <project path="external/tremolo" name="platform/external/tremolo" /> - <project path="external/skia" name="platform/external/skia" /> <project path="packages/apps/Settings" name="platform/packages/apps/Settings" /> <project path="cts" name="platform/cts" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" /> diff --git a/staging-panda.xml b/staging-panda.xml index ee122e2..e25cc44 100644 --- a/staging-panda.xml +++ b/staging-panda.xml @@ -117,10 +117,11 @@ <project path="external/llvm" name="platform/external/llvm" /> <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" /> <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" /> + <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support --> + <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" /> <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> <project path="external/tremolo" name="platform/external/tremolo" /> - <project path="external/skia" name="platform/external/skia" /> <project path="packages/apps/Settings" name="platform/packages/apps/Settings" /> <project path="cts" name="platform/cts" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" /> diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml index 81d987f..1f5e8f4 100644 --- a/staging-vexpress-rtsm-isw.xml +++ b/staging-vexpress-rtsm-isw.xml @@ -130,10 +130,11 @@ <project path="external/llvm" name="platform/external/llvm" /> <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" /> <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" /> + <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support --> + <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" /> <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> <project path="external/tremolo" name="platform/external/tremolo" /> - <project path="external/skia" name="platform/external/skia" /> <project path="packages/apps/Settings" name="platform/packages/apps/Settings" /> <project path="cts" name="platform/cts" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" /> diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml index d91af3b..61dd27e 100644 --- a/staging-vexpress-rtsm.xml +++ b/staging-vexpress-rtsm.xml @@ -129,10 +129,11 @@ <project path="external/llvm" name="platform/external/llvm" /> <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" /> <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" /> + <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support --> + <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" /> <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> <project path="external/tremolo" name="platform/external/tremolo" /> - <project path="external/skia" name="platform/external/skia" /> <project path="packages/apps/Settings" name="platform/packages/apps/Settings" /> <project path="cts" name="platform/cts" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" /> diff --git a/staging-vexpress.xml b/staging-vexpress.xml index 2f27504..64ee534 100644 --- a/staging-vexpress.xml +++ b/staging-vexpress.xml @@ -120,10 +120,11 @@ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" /> <project path="external/llvm" name="platform/external/llvm" /> <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" /> + <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support --> + <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" /> <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> <project path="external/tremolo" name="platform/external/tremolo" /> - <project path="external/skia" name="platform/external/skia" /> <project path="packages/apps/Settings" name="platform/packages/apps/Settings" /> <project path="cts" name="platform/cts" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" /> diff --git a/tracking-panda.xml b/tracking-panda.xml index 832f367..44d150e 100644 --- a/tracking-panda.xml +++ b/tracking-panda.xml @@ -116,10 +116,11 @@ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" /> <project path="external/llvm" name="platform/external/llvm" /> <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" /> + <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support --> + <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" /> <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> <project path="external/tremolo" name="platform/external/tremolo" /> - <project path="external/skia" name="platform/external/skia" /> <project path="packages/apps/Settings" name="platform/packages/apps/Settings" /> <project path="cts" name="platform/cts" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" /> diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml index 0161b10..cef7bd0 100644 --- a/tracking-vexpress.xml +++ b/tracking-vexpress.xml @@ -119,10 +119,11 @@ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" /> <project path="external/llvm" name="platform/external/llvm" /> <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" /> + <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support --> + <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" /> <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" /> <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" /> <project path="external/tremolo" name="platform/external/tremolo" /> - <project path="external/skia" name="platform/external/skia" /> <project path="packages/apps/Settings" name="platform/packages/apps/Settings" /> <project path="cts" name="platform/cts" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" /> |