[FE training-materials-updates] Android labs: repo now complains when replacing existing code

Alexandre Belloni alexandre.belloni at free-electrons.com
Fri Jul 8 11:14:28 CEST 2016

Repository : git://git.free-electrons.com/training-materials.git
On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=426233c0c1b29912a5cdf231d03b8de3d6bea742


commit 426233c0c1b29912a5cdf231d03b8de3d6bea742
Author: Alexandre Belloni <alexandre.belloni at free-electrons.com>
Date:   Fri Jul 8 11:12:46 2016 +0200

    Android labs: repo now complains when replacing existing code
    Signed-off-by: Alexandre Belloni <alexandre.belloni at free-electrons.com>


 labs/android-native-library/android-native-library.tex | 2 ++
 labs/android-new-board/android-new-board.tex           | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/labs/android-native-library/android-native-library.tex b/labs/android-native-library/android-native-library.tex
index bb72cd6..a4f6777 100644
--- a/labs/android-native-library/android-native-library.tex
+++ b/labs/android-native-library/android-native-library.tex
@@ -21,6 +21,8 @@ to remove both the existing \code{libusb} and \code{libusb_aah}
 projects from the manifests.
 Then, do a \code{repo sync -c}, and everything should be downloaded.
+Note that you may have to use \code{repo sync --force-sync
 For this library, all the needed \code{.c} files are located in the
 \code{libusb} folder and its subfolders. The headers are located in
diff --git a/labs/android-new-board/android-new-board.tex b/labs/android-new-board/android-new-board.tex
index 029f7fe..f23e576 100644
--- a/labs/android-new-board/android-new-board.tex
+++ b/labs/android-new-board/android-new-board.tex
@@ -31,6 +31,8 @@ at revision \code{rowboat-jb-4.3-fe}, and store it to
 Once done, you can run \code{repo sync -c} again. It will download the
 new git tree we just added and add it to our source code.
+Note that you may have to use \code{repo sync --force-sync kernel} to
+force syncing over the previously fetched kernel sources.
 \section{Build the kernel}

More information about the training-materials-updates mailing list