Maxime Ripard maxime.ripard at free-electrons.com
Mon May 19 12:03:14 CEST 2014

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

On branch  : master

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

commit 194aed7fdedc9ae1af66b9b72af5e70ea15a24b4
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date:   Mon May 19 11:31:21 2014 +0200

Use a local manifest to download libusb just like we're doing in the rest of
the labs.

Also, both external/libusb and external/libusb-aah have to be removed to
prevent conflicts.

Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>

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

194aed7fdedc9ae1af66b9b72af5e70ea15a24b4
.../android-native-library.tex                     |   22 +++++---------------
1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/labs/android-native-library/android-native-library.tex b/labs/android-native-library/android-native-library.tex
index 865a140..5e2dc79 100644
--- a/labs/android-native-library/android-native-library.tex
+++ b/labs/android-native-library/android-native-library.tex
@@ -14,23 +14,11 @@ reason isn't actually using it or made a Makefile for it. Since we
need a more recent version anyway, we will need to edit the manifest

-Edit the file \code{.repo/manifest.xml}. This is the manifest
-currently used by repo. As you can see, it holds the git repositories
-of every pieces assembled to form the Android source code.
-
-The first step will be to add a remote git server to the list of those
-availables to \code{repo}.
-
-\begin{verbatim}
-<remote fetch="git://libusb.org" name="libusb" />
-\end{verbatim}
-
-Then, go to the line that defines the libusb project, and edit it to
-specify that you want to use the remote we just defined (using the
-\code{remote} attribute), that we want to use the version 1.0.9, that
-is in git \code{refs/tags/1.0.9} (using the \code{revision} XML
-attribute), and change the value of the name attribute to
-\code{libusb}.
+Create a new local manifest to download the libusb from the git
+repository \code{git://libusb.org/libusb.git}. You'll need to use the
+version 1.0.9, that is in git \code{refs/tags/1.0.9}. You'll also need
+to remove both the existing \code{libusb} and \code{libusb_aah}
+projects from the manifests.