tuna: Workaround for 4.2 simg2img move
Building simg2img from 4.2's system/extra tree isn't possible.
Use 4.1.2's simg2img for now
(Real fix will be to get 4.2's simg2img from its new location)
Change-Id: Ib141a512c919ff294f16953517a25947ce1f8319
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
diff --git a/merge-gnexus-blobs b/merge-gnexus-blobs
index 0e67c1b..3b5b402 100755
--- a/merge-gnexus-blobs
+++ b/merge-gnexus-blobs
@@ -72,7 +72,7 @@
cd core
git checkout -b jb origin/linaro_android_4.2
cd ../extras
- git checkout -b jb android-4.2_r1
+ git checkout -b jb android-4.1.2_r1
cd ext4_utils
gcc $CFLAGS -o simg2img simg2img.c sparse_crc32.c
gcc $CFLAGS -o make_ext4fs make_ext4fs_main.c make_ext4fs.c ext4fixup.c ext4_utils.c allocate.c backed_block.c output_file.c contents.c extent.c indirect.c uuid.c sha1.c sparse_crc32.c wipe.c -lz
