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 6a8e61b..2956f61 100644 --- a/default.xml +++ b/default.xml @@ -134,6 +134,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 modification: Add workaround for aliasing violation --> + <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -230,7 +232,6 @@ <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/libyuv" name="platform/external/libyuv" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" /> <project path="external/littlemock" name="platform/external/littlemock" /> <project path="external/lohit-fonts" name="platform/external/lohit-fonts" /> <project path="external/markdown" name="platform/external/markdown" /> diff --git a/landing-snowball.xml b/landing-snowball.xml index 0e4aaff..1aee82e 100644 --- a/landing-snowball.xml +++ b/landing-snowball.xml @@ -138,6 +138,8 @@ <project path="external/libvpx" name="platform/external/libvpx" /> <project path="external/gtest" name="platform/external/gtest" /> <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" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -232,7 +234,6 @@ <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/libyuv" name="platform/external/libyuv" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" /> <project path="external/littlemock" name="platform/external/littlemock" /> <project path="external/lohit-fonts" name="platform/external/lohit-fonts" /> <project path="external/markdown" name="platform/external/markdown" /> diff --git a/linaro-default.xml b/linaro-default.xml index 04b5e7c..031b97e 100644 --- a/linaro-default.xml +++ b/linaro-default.xml @@ -137,6 +137,8 @@ <project path="external/libvpx" name="platform/external/libvpx" /> <project path="external/gtest" name="platform/external/gtest" /> <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" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -231,7 +233,6 @@ <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/libyuv" name="platform/external/libyuv" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" /> <project path="external/littlemock" name="platform/external/littlemock" /> <project path="external/lohit-fonts" name="platform/external/lohit-fonts" /> <project path="external/markdown" name="platform/external/markdown" /> diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml index 55ac8f7..9f597f0 100644 --- a/staging-galaxynexus.xml +++ b/staging-galaxynexus.xml @@ -127,6 +127,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 modification: Add workaround for aliasing violation --> + <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -223,7 +225,6 @@ <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/libyuv" name="platform/external/libyuv" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" /> <project path="external/littlemock" name="platform/external/littlemock" /> <project path="external/lohit-fonts" name="platform/external/lohit-fonts" /> <project path="external/markdown" name="platform/external/markdown" /> diff --git a/staging-origen.xml b/staging-origen.xml index 8697d34..db21b8b 100644 --- a/staging-origen.xml +++ b/staging-origen.xml @@ -137,6 +137,8 @@ <project path="external/libvpx" name="platform/external/libvpx" /> <project path="external/gtest" name="platform/external/gtest" /> <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" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -231,7 +233,6 @@ <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/libyuv" name="platform/external/libyuv" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" /> <project path="external/littlemock" name="platform/external/littlemock" /> <project path="external/lohit-fonts" name="platform/external/lohit-fonts" /> <project path="external/markdown" name="platform/external/markdown" /> diff --git a/staging-panda.xml b/staging-panda.xml index 57b40a2..51dae77 100644 --- a/staging-panda.xml +++ b/staging-panda.xml @@ -109,6 +109,8 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" /> <!-- Linaro modifications: Use -fno-strict-aliasing --> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" /> + <!-- 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="libcore" name="platform/libcore" /> <project path="frameworks/ex" name="platform/frameworks/ex" /> <project path="external/llvm" name="platform/external/llvm" /> @@ -229,7 +231,6 @@ <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/libyuv" name="platform/external/libyuv" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" /> <project path="external/littlemock" name="platform/external/littlemock" /> <project path="external/lohit-fonts" name="platform/external/lohit-fonts" /> <project path="external/markdown" name="platform/external/markdown" /> diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml index a3dbaef..c8f9227 100644 --- a/staging-vexpress-rtsm-isw.xml +++ b/staging-vexpress-rtsm-isw.xml @@ -122,6 +122,8 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" /> <!-- Linaro modifications: Use -fno-strict-aliasing --> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" /> + <!-- 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="libcore" name="platform/libcore" /> <project path="frameworks/ex" name="platform/frameworks/ex" /> <project path="external/llvm" name="platform/external/llvm" /> @@ -241,7 +243,6 @@ <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/libyuv" name="platform/external/libyuv" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" /> <project path="external/littlemock" name="platform/external/littlemock" /> <project path="external/lohit-fonts" name="platform/external/lohit-fonts" /> <project path="external/markdown" name="platform/external/markdown" /> diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml index 1fac77a..ff3fdc6 100644 --- a/staging-vexpress-rtsm.xml +++ b/staging-vexpress-rtsm.xml @@ -121,6 +121,8 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" /> <!-- Linaro modifications: Use -fno-strict-aliasing --> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" /> + <!-- 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="libcore" name="platform/libcore" /> <project path="frameworks/ex" name="platform/frameworks/ex" /> <project path="external/llvm" name="platform/external/llvm" /> @@ -240,7 +242,6 @@ <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/libyuv" name="platform/external/libyuv" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" /> <project path="external/littlemock" name="platform/external/littlemock" /> <project path="external/lohit-fonts" name="platform/external/lohit-fonts" /> <project path="external/markdown" name="platform/external/markdown" /> diff --git a/staging-vexpress.xml b/staging-vexpress.xml index 3192f75..b5ca317 100644 --- a/staging-vexpress.xml +++ b/staging-vexpress.xml @@ -112,6 +112,8 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" /> <!-- Linaro modifications: Use -fno-strict-aliasing --> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" /> + <!-- 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="libcore" name="platform/libcore" /> <project path="frameworks/ex" name="platform/frameworks/ex" /> <project path="external/llvm" name="platform/external/llvm" /> @@ -232,7 +234,6 @@ <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/libyuv" name="platform/external/libyuv" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" /> <project path="external/littlemock" name="platform/external/littlemock" /> <project path="external/lohit-fonts" name="platform/external/lohit-fonts" /> <project path="external/markdown" name="platform/external/markdown" /> diff --git a/tracking-panda.xml b/tracking-panda.xml index ade7ce8..0d23413 100644 --- a/tracking-panda.xml +++ b/tracking-panda.xml @@ -108,6 +108,8 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" /> <!-- Linaro modifications: Use -fno-strict-aliasing --> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" /> + <!-- 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="libcore" name="platform/libcore" /> <project path="frameworks/ex" name="platform/frameworks/ex" /> <project path="external/llvm" name="platform/external/llvm" /> @@ -228,7 +230,6 @@ <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/libyuv" name="platform/external/libyuv" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" /> <project path="external/littlemock" name="platform/external/littlemock" /> <project path="external/lohit-fonts" name="platform/external/lohit-fonts" /> <project path="external/markdown" name="platform/external/markdown" /> diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml index a6d1e0d..eb70a84 100644 --- a/tracking-vexpress.xml +++ b/tracking-vexpress.xml @@ -111,6 +111,8 @@ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1" /> <!-- Linaro modifications: Use -fno-strict-aliasing --> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" /> + <!-- 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="libcore" name="platform/libcore" /> <project path="frameworks/ex" name="platform/frameworks/ex" /> <project path="external/llvm" name="platform/external/llvm" /> @@ -231,7 +233,6 @@ <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/libxslt" name="platform/external/libxslt" /> <project path="external/libyuv" name="platform/external/libyuv" /> - <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" /> <project path="external/littlemock" name="platform/external/littlemock" /> <project path="external/lohit-fonts" name="platform/external/lohit-fonts" /> <project path="external/markdown" name="platform/external/markdown" /> |