manifest: Update to Android 4.2.1_r1
Change-Id: I2881a7ae6604540c097714e68244f04ae7e6adc1
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
diff --git a/default.xml b/default.xml
index 5eae3aa..1f9b413 100644
--- a/default.xml
+++ b/default.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -54,99 +54,99 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make sure we can find omapfb.h -->
<!-- FIXME The 4.0.4 branch contains further changes that may need merging -->
- <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, various bugfixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase maximum number of partitions -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2"/>
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2"/>
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2"/>
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2"/>
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2"/>
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2"/>
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2"/>
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2"/>
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1"/>
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2"/>
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2"/>
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1"/>
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- 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.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Need porting -->
- <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.2_r1" />
+ <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.2.1_r1" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
- <project path="cts" name="platform/cts" revision="refs/tags/android-4.2_r1" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
- <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.2_r1" />
- <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.2_r1" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
+ <project path="cts" name="platform/cts" revision="refs/tags/android-4.2.1_r1" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
+ <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.2.1_r1" />
+ <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.2.1_r1" />
<!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: need to be restored -->
- <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.2_r1" />
+ <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.2.1_r1" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<!-- Linaro modifications: Made it build with OpenJDK -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
<!-- Linaro modification: ISO C++ 11 support -->
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index ba4fd8e..e377108 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -63,99 +63,99 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, assorted bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2"/>
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1"/>
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
<!-- Linaro modification: ISO C++ 11 support -->
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 488310b..0004de7 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -62,99 +62,99 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<!-- Linaro modification: ISO C++ 11 support -->
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.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 2b79230..881dfd9 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -11,7 +11,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -52,98 +52,98 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" groups="device" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" groups="device" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make sure we can find omapfb.h -->
<!-- FIXME The 4.0.4 branch contains further changes that may need merging -->
- <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, various bugfixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase maximum number of partitions -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2"/>
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2"/>
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2"/>
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2"/>
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2"/>
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2"/>
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2"/>
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2"/>
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1"/>
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2"/>
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2"/>
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1"/>
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- 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.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Need porting -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
- <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.2_r1" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
+ <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.2.1_r1" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
- <project path="cts" name="platform/cts" revision="refs/tags/android-4.2_r1" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
- <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.2_r1" />
- <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.2_r1" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
+ <project path="cts" name="platform/cts" revision="refs/tags/android-4.2.1_r1" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
+ <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.2.1_r1" />
+ <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.2.1_r1" />
<!-- Linaro modifications: ISO C++11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: need to be restored -->
- <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.2_r1" />
+ <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.2.1_r1" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<!-- Linaro modifications: Made it build with OpenJDK -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" groups="device" />
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" groups="device" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" groups="device" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" groups="device" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
<!-- Linaro modification: ISO C++ 11 support -->
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/staging-origen.xml b/staging-origen.xml
index f8f9885..96cea95 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -62,99 +62,99 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
<!-- Linaro modification: ISO C++ 11 support -->
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 9f9dcfe..73985b3 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -60,98 +60,98 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, assorted bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 794cd28..9e30356 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -12,7 +12,7 @@
fetch="ssh://linaro-big-little-switcher-bot@linaro-private.git.linaro.org/srv/linaro-private.git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -70,99 +70,99 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags etc -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2" />
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index cdaba9b..b8def93 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -69,99 +69,99 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags etc -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2" />
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/staging-vexpress-tc2-isw.xml b/staging-vexpress-tc2-isw.xml
index 5d8761f..f02d5f3 100644
--- a/staging-vexpress-tc2-isw.xml
+++ b/staging-vexpress-tc2-isw.xml
@@ -12,7 +12,7 @@
fetch="ssh://linaro-big-little-switcher-bot@linaro-private.git.linaro.org/srv/linaro-private.git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -69,92 +69,92 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags etc -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2" />
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<project path="external/libvpx" name="platform/external/libvpx" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 9660646..8305cff 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -62,98 +62,98 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, assorted bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-origen-quad.xml b/tracking-origen-quad.xml
index 394a5de..dedfe95 100644
--- a/tracking-origen-quad.xml
+++ b/tracking-origen-quad.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -61,99 +61,99 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
<!-- Linaro modification: ISO C++ 11 support -->
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-origen.xml b/tracking-origen.xml
index b03e18e..f894080 100644
--- a/tracking-origen.xml
+++ b/tracking-origen.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -60,98 +60,98 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 961eb33..1f711a5 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -59,98 +59,98 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, assorted bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index ff5b183..2de5cfe 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -62,96 +62,96 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, assorted bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2"/>
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1"/>
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-vexpress-lw.xml b/tracking-vexpress-lw.xml
index 95663a7..b24b4e7 100644
--- a/tracking-vexpress-lw.xml
+++ b/tracking-vexpress-lw.xml
@@ -12,7 +12,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -69,98 +69,98 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, assorted bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-vexpress-rtsm-mp.xml b/tracking-vexpress-rtsm-mp.xml
index 67e0d82..d1ab66c 100644
--- a/tracking-vexpress-rtsm-mp.xml
+++ b/tracking-vexpress-rtsm-mp.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -66,99 +66,99 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags etc -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2" />
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-vexpress-tests.xml b/tracking-vexpress-tests.xml
index d9d8d70..4c16b9e 100644
--- a/tracking-vexpress-tests.xml
+++ b/tracking-vexpress-tests.xml
@@ -12,7 +12,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -67,98 +67,98 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, assorted bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 7aadc3f..b881e93 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -10,7 +10,7 @@
fetch="git://git.linaro.org/" />
<remote name="zyga"
fetch="git://github.com/zyga/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
@@ -63,98 +63,98 @@
<!-- AOSP with Linaro additions -->
<!-- Linaro modifications: Made it build with OpenJDK, Compiler detection macros, optimization flags, uboot support -->
- <project path="build" name="platform/build" revision="linaro_android_4.2">
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1">
<copyfile src="core/root.mk" dest="Makefile" />
</project>
<!-- Linaro modifications: gcc 4.6+ -Werror support -->
- <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2" />
- <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2" />
- <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2" />
+ <project path="dalvik" name="platform/dalvik" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" revision="linaro_android_4.2.1" />
+ <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.1" />
+ <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Add private lib for wifi to work with generic wext driver -->
- <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2" />
+ <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Integrate Linaro build system extras -->
- <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2" />
+ <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Added property to turn off hardware GFX -->
- <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2" />
+ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
- <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
- <project path="bionic" name="platform/bionic" revision="linaro_android_4.2" />
+ <project path="bionic" name="platform/bionic" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
- <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2"/>
+ <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: gcc 4.7 support -->
- <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2" />
- <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2" />
- <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2" />
- <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2" />
- <project path="system/security" name="platform/system/security" revision="linaro_android_4.2" />
+ <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.2.1" />
+ <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.2.1" />
+ <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.2.1" />
+ <project path="frameworks/support" name="platform/frameworks/support" revision="linaro_android_4.2.1" />
+ <project path="system/security" name="platform/system/security" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: support for non-prebuilt toolchain -->
- <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2" />
+ <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.2.1" />
<!-- 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: Fix the float ABI check for gcc 4.7+ -->
- <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
+ <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Make it build with OpenJDK" -->
- <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
+ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
- <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2" />
- <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2" />
+ <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+ <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.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.2" />
+ <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: New init.rc, assorted bug fixes -->
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
- <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2" />
+ <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
- <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2" />
+ <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
- <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2" />
+ <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Fix aliasing violations -->
- <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2" />
- <project path="libcore" name="platform/libcore" revision="linaro_android_4.2" />
- <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2"/>
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2" />
- <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2" />
- <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2" />
+ <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.2.1" />
+ <project path="libcore" name="platform/libcore" revision="linaro_android_4.2.1" />
+ <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.2.1"/>
+ <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.2.1" />
+ <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.2.1" />
+ <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.2.1" />
<!-- Linaro modifications: Use -fno-strict-aliasing -->
- <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2" />
- <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2" />
- <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2" />
- <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2" />
- <project path="development" name="platform/development" revision="linaro_android_4.2" />
- <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2" />
- <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2" />
- <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2" />
- <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2" />
- <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2" />
- <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2" />
+ <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.2.1" />
+ <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.2.1" />
+ <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.2.1" />
+ <project path="development" name="platform/development" revision="linaro_android_4.2.1" />
+ <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" revision="linaro_android_4.2.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.2.1" />
+ <project path="external/mesa3d" name="platform/external/mesa3d" revision="linaro_android_4.2.1" />
+ <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.1" />
+ <project path="external/openssh" name="platform/external/openssh" revision="linaro_android_4.2.1" />
+ <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.2.1" />
+ <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="linaro_android_4.2.1" />
<!-- Linaro modification: Add workaround for aliasing violation -->
- <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2" />
- <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2" />
- <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2"/>
+ <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.1" />
+ <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.2.1" />
+ <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.2.1"/>
<!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
- <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2" />
+ <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.1" />
<project path="external/tremolo" name="platform/external/tremolo" />
<!-- Linaro modifications: Add ECM -->
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2" />
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.1" />
<project path="cts" name="platform/cts" />
- <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2" />
+ <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.1" />
<project path="system/media" name="platform/system/media" />
<project path="external/strace" name="platform/external/strace" />
<!-- Linaro modifications: ISO C++ 11 support -->
- <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2" />
- <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2" />
- <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2" />
- <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2" />
+ <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.1" />
+ <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.1" />
+ <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.1" />
+ <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.1" />
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
<project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<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"/>
- <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2" />
+ <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.1" />
<!-- TI proprietary-open -->
<project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
diff --git a/vexpress-juice-aosp.xml b/vexpress-juice-aosp.xml
index e94addb..40842de 100644
--- a/vexpress-juice-aosp.xml
+++ b/vexpress-juice-aosp.xml
@@ -11,12 +11,12 @@
review="review.android.git.linaro.org" />
<remote name="linaro-other"
fetch="git://git.linaro.org/" />
- <default revision="refs/tags/android-4.2_r1"
+ <default revision="refs/tags/android-4.2.1_r1"
remote="aosp"
sync-j="4" />
<!-- Modified from AOSP so we can build tarball targets -->
- <project path="build" name="platform/build" revision="linaro_android_4.2" >
+ <project path="build" name="platform/build" revision="linaro_android_4.2.1" >
<copyfile src="core/root.mk" dest="Makefile" />
</project>
@@ -341,7 +341,7 @@
<project path="prebuilts/tools" name="platform/prebuilts/tools" />
<project path="sdk" name="platform/sdk" />
<project path="system/bluetooth" name="platform/system/bluetooth" />
- <project path="system/core" name="platform/system/core" revision="linaro_android_4.2_build_fixes_only" />
+ <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.1_build_fixes_only" />
<project path="system/extras" name="platform/system/extras" />
<project path="system/media" name="platform/system/media" />
<project path="system/netd" name="platform/system/netd" />
