diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-08-21 21:35:03 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-08-25 14:27:34 +0530 |
| commit | 6bcf5b0e31350fb2c055b550036086355123ad57 (patch) | |
| tree | f3648e03ebeebf8d947a1898252d37734ef48434 | |
| parent | 3f81ae36ffa47614f888d4244b7046813758ee99 (diff) | |
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rw-r--r-- | build-scripts/build-android | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index fc5aad2..ba7b617 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -25,7 +25,7 @@ source "${BUILD_SCRIPT_ROOT}"/helpers trap infrastructure_error ERR # Set TARGET_OUT_DIR since few TARGET_PRODUCT include "full_" keyword as well -export TARGET_OUT_DIR=`echo $TARGET_PRODUCT | sed 's/_/\n/;s/.*\n//'` +export TARGET_OUT_DIR="*" if [ -n "$BUILD_COPYCAT" ]; then @@ -150,6 +150,12 @@ else trap - ERR export TIMEFORMAT="TIME: Compilation: %lR" + + if [ -n "$LUNCH_TARGET" ]; then + source build/envsetup.sh + lunch $LUNCH_TARGET + fi + time $MAKE $MAKE_OPTS -j$MAKE_JOBS $MAKE_TARGETS $SHOWCOMMANDS WITH_HOST_DALVIK="$WITH_HOST_DALVIK" unset TIMEFORMAT trap infrastructure_error ERR @@ -196,7 +202,7 @@ if [ -f out/kernel_config ]; then fi if [ ! -n "$SKIP_LICENSE_CHECK" ]; then - ${BUILD_SCRIPT_ROOT}/license-verification.sh out/pinned-manifest.xml out/target/product/$TARGET_PRODUCT/BUILD-INFO.txt + ${BUILD_SCRIPT_ROOT}/license-verification.sh out/pinned-manifest.xml out/target/product/$TARGET_OUT_DIR/BUILD-INFO.txt fi ${BUILD_SCRIPT_ROOT}/../utils/manifest-descriptions/make.sh out/source-manifest.xml out/pinned-manifest.xml |