[FE training-materials-updates] Patches to compile Android 2.3 on Ubuntu 12.04

[Michael Opdenacker]

Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=3f6aadf436b6f0cb35e46a5bb15b40419332a492

>---------------------------------------------------------------

commit 3f6aadf436b6f0cb35e46a5bb15b40419332a492
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Fri Dec 14 16:44:03 2012 +0100

    Patches to compile Android 2.3 on Ubuntu 12.04
    
    Instructions will follow after completing all the tests
    on 12.04


>---------------------------------------------------------------

3f6aadf436b6f0cb35e46a5bb15b40419332a492
 .../aosp/patches/01-add-fpermissive-flag.patch     |   11 +++++++++++
 .../aosp/patches/02-undefine-FORTIFY-SOURCE.patch  |   10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/lab-data/android/aosp/patches/01-add-fpermissive-flag.patch b/lab-data/android/aosp/patches/01-add-fpermissive-flag.patch
new file mode 100644
index 0000000..9b76ab2
--- /dev/null
+++ b/lab-data/android/aosp/patches/01-add-fpermissive-flag.patch
@@ -0,0 +1,11 @@
+--- ./android.orig/frameworks/base/libs/utils/Android.mk	2012-12-14 12:46:22.918266602 +0100
++++ ./android/frameworks/base/libs/utils/Android.mk	2012-12-14 12:51:39.714252478 +0100
+@@ -57,7 +57,7 @@
+ 
+ LOCAL_MODULE:= libutils
+ 
+-LOCAL_CFLAGS += -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS)
++LOCAL_CFLAGS += -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS) -fpermissive
+ LOCAL_C_INCLUDES += external/zlib
+ 
+ ifeq ($(HOST_OS),windows)
diff --git a/lab-data/android/aosp/patches/02-undefine-FORTIFY-SOURCE.patch b/lab-data/android/aosp/patches/02-undefine-FORTIFY-SOURCE.patch
new file mode 100644
index 0000000..079244d
--- /dev/null
+++ b/lab-data/android/aosp/patches/02-undefine-FORTIFY-SOURCE.patch
@@ -0,0 +1,10 @@
+--- ./android.orig/build/core/combo/HOST_linux-x86.mk	2012-12-14 13:00:39.338228419 +0100
++++ ./android/build/core/combo/HOST_linux-x86.mk	2012-12-14 13:01:48.686225327 +0100
+@@ -58,6 +58,6 @@
+ 	-include $(call select-android-config-h,linux-x86)
+ 
+ # Disable new longjmp in glibc 2.11 and later. See bug 2967937.
+-HOST_GLOBAL_CFLAGS += -D_FORTIFY_SOURCE=0
++HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
+ 
+ HOST_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined