[FE training-materials-updates] Remove the patches for ubuntu versions, and updated the intstructions

[Maxime Ripard]

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

On branch  : jelly-bean
Link       : http://git.free-electrons.com/training-materials/commit/?id=d9cc93386703597b1190705c246f642fb360e5fe

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

commit d9cc93386703597b1190705c246f642fb360e5fe
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date:   Thu Aug 29 10:49:59 2013 +0200

    Remove the patches for ubuntu versions, and updated the intstructions
    
    Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>


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

d9cc93386703597b1190705c246f642fb360e5fe
 .../aosp/patches/01-add-fpermissive-flag.patch     |   11 ------
 .../aosp/patches/02-undefine-FORTIFY-SOURCE.patch  |   10 -----
 .../android-first-compilation.tex                  |   40 +-------------------
 3 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/lab-data/android/aosp/.empty b/lab-data/android/aosp/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/lab-data/android/aosp/patches/01-add-fpermissive-flag.patch b/lab-data/android/aosp/patches/01-add-fpermissive-flag.patch
deleted file mode 100644
index e556c5a..0000000
--- a/lab-data/android/aosp/patches/01-add-fpermissive-flag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 0f6c045..0000000
--- a/lab-data/android/aosp/patches/02-undefine-FORTIFY-SOURCE.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
diff --git a/labs/android-first-compilation/android-first-compilation.tex b/labs/android-first-compilation/android-first-compilation.tex
index e134e6c..6bd94fb 100644
--- a/labs/android-first-compilation/android-first-compilation.tex
+++ b/labs/android-first-compilation/android-first-compilation.tex
@@ -30,44 +30,8 @@ echo $PATH
 You will see that \code{build/envsetup.sh} hasn't modified your
 \code{PATH}.  This will be done during the build job.
 
-The target product for the emulator is {\it generic}, and we want to
-have an engineering build. To do this, run \code{lunch generic-eng}
-
-\section{Patches for Ubuntu 12.04 and beyond}
-
-Google supports Ubuntu 10.04 for building Android 2.3 Gingerbread.
-However, with two minor patches, it is possible to build this version
-with Ubuntu 12.04.
-
-Let's apply these patches (stay in the \code{android} directory to run
-the below command):
-
-\begin{verbatim}
-cat $HOME/felabs/android/aosp/patches/*.patch | patch -p1
-\end{verbatim}
-
-\section{Fixes for Ubuntu 12.10}
-
-We don't officially support Ubuntu 12.10 for our Android labs, but you
-may be forced to use this version if you have a recent PC and earlier
-versions of Ubuntu don't support it yet.
-
-Ubuntu 12.10 ships with gcc 4.7, which is too recent to build Android
-2.3. Hence, we need to install gcc 4.6, and make it the default version
-used on your system:
-
-\begin{verbatim}
-sudo apt-get install gcc-4.6 g++-4.6 gcc-4.6-multilib g++-4.6-multilib
-sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50
-sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.6 100
-sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50
-sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.6 100
-sudo update-alternatives --install /usr/bin/cpp cpp-bin /usr/bin/cpp-4.7 50
-sudo update-alternatives --install /usr/bin/cpp cpp-bin /usr/bin/cpp-4.6 100
-sudo update-alternatives --set g++ /usr/bin/g++-4.6
-sudo update-alternatives --set g++ /usr/bin/gcc-4.6
-sudo update-alternatives --set cpp-bin /usr/bin/cpp-4.6
-\end{verbatim}
+The target product for the emulator is {\it full}, and we want to
+have an engineering build. To do this, run \code{lunch full-eng}
 
 \section{Compile the root filesystem}