commit 8ed01f38163bafa721ff5bc066a71ca46240b827
author Christoffer Dall <christoffer.dall@linaro.org> Wed Dec 17 21:34:12 2014 +0100
committer David 'Digit' Turner <digit@google.com> Mon Jan 05 17:49:37 2015 +0100
tree edffd45572a453d6124c39f3051f1f7217e6171f
parent ae90c07c9786622acf9ee329282161ed9aea011e

build_image: Set file system labels on disk images

When building images set the mount point (data,cache,system) as the
filesystem label on the generated image.  This is required for the
Android Emulator.

IMPORTANT: This depends on the following patch to system/extras/:

    https://android-review.googlesource.com/#/c/120047/

which has already been submitted to AOSP and merged into the
internal tree.

Change-Id: Iaeb45462570c26d37980f1cc5d8a1b929e476c89
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>

tools/releasetools/build_image.py

diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index a010e84..777a91a 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -246,6 +246,7 @@
       build_command.extend(["-C", fs_config])
     if block_list is not None:
       build_command.extend(["-B", block_list])
+    build_command.extend(["-L", prop_dict["mount_point"]])
     if fc_config is not None:
       build_command.append(fc_config)
     elif "selinux_fc" in prop_dict: