diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-03-06 07:03:03 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-03-06 07:03:03 +0530 |
| commit | 9fff0b0ae65823aeab95c30385e2ff4d34a72ef8 (patch) | |
| tree | 0a849bbccfffce4333b72d688e9d22ce5593f5e1 | |
| parent | f5f48c38b6c74a93829fe8e224eacc20ed3f51d7 (diff) | |
Change-Id: I50aa11c97d02e1971e9eebad63a3e3e3d7f255c0
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rw-r--r-- | build-scripts/build-android | 17 | ||||
| -rwxr-xr-x | build-scripts/create-user-kernel-script | 2 | ||||
| -rw-r--r-- | build-scripts/helpers | 4 |
3 files changed, 10 insertions, 13 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index 8ec53fd..4f96d0d 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -24,9 +24,6 @@ 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//'` - if [ -n "$BUILD_COPYCAT" ]; then download_another_build "$BUILD_COPYCAT" @@ -147,19 +144,19 @@ if [ -n "$BUILD_FS_IMAGE" ]; then FS_IMAGE_SIZE=${FS_IMAGE_SIZE-2G} sudo linaro-android-media-create \ --dev `product2lamc_dev $TARGET_PRODUCT` \ - --system $PWD/out/target/product/$TARGET_OUT_DIR/system.tar.bz2 \ - --userdata $PWD/out/target/product/$TARGET_OUT_DIR/userdata.tar.bz2 \ - --boot $PWD/out/target/product/$TARGET_OUT_DIR/boot.tar.bz2 \ + --system $PWD/out/target/product/*/system.tar.bz2 \ + --userdata $PWD/out/target/product/*/userdata.tar.bz2 \ + --boot $PWD/out/target/product/*/boot.tar.bz2 \ --image-size "$FS_IMAGE_SIZE" \ - --image-file out/target/product/$TARGET_OUT_DIR/$TARGET_PRODUCT.img - bzip2 -9 out/target/product/$TARGET_PRODUCT/$TARGET_PRODUCT.img + --image-file out/target/product/*/$TARGET_PRODUCT.img + bzip2 -9 out/target/product/*/$TARGET_PRODUCT.img fi # Store kernel .config as a build artifact if [ -f kernel/.config ]; then cp kernel/.config out/kernel_config -elif [ -f "out/target/product/$TARGET_OUT_DIR/obj/kernel/.config" ]; then - cp "out/target/product/$TARGET_OUT_DIR/obj/kernel/.config" out/kernel_config +elif [ -f "out/target/product/*/obj/kernel/.config" ]; then + cp "out/target/product/*/obj/kernel/.config" out/kernel_config fi # Create md5sums file for platform artifacts (cd out/target/product/*/; md5sum *.tar.bz2 *.img >MD5SUMS) || true diff --git a/build-scripts/create-user-kernel-script b/build-scripts/create-user-kernel-script index bb1ec52..d1e5edd 100755 --- a/build-scripts/create-user-kernel-script +++ b/build-scripts/create-user-kernel-script @@ -65,7 +65,7 @@ fi sync_commands() { -KERNELNAME=`python -c "import os.path; print os.path.relpath(os.path.realpath('target/product/$TARGET_OUT_DIR/obj/kernel/source'), '../')"` +KERNELNAME=`python -c "import os.path; print os.path.relpath(os.path.realpath('target/product/*/obj/kernel/source'), '../')"` GITINFO=`PYTHONPATH=../.repo/repo ${BUILD_SCRIPT_ROOT}/repo_project_info.py -d ../ -p ${KERNELNAME}` #echo "# $GITINFO" GITURL=`echo $GITINFO | cut -d\| -f1` diff --git a/build-scripts/helpers b/build-scripts/helpers index 2c67f98..1d0f033 100644 --- a/build-scripts/helpers +++ b/build-scripts/helpers @@ -119,7 +119,7 @@ download_another_build () { else baseurl=$1 fi - local dir=out/target/product/$TARGET_OUT_DIR + local dir=out/target/product/* mkdir -p $dir pushd $dir wget -nv --no-check-certificate "$baseurl/boot.tar.bz2" || true @@ -137,7 +137,7 @@ download_another_build () { flatten_artifacts () { if [ "$FLATTEN_ARTIFACTS" != "0" ]; then - mv out/target/product/$TARGET_OUT_DIR/* out/ + mv out/target/product/*/* out/ rm -r out/target fi } |