diff options
Diffstat (limited to 'build-scripts/build-android')
| -rw-r--r-- | build-scripts/build-android | 17 |
1 files changed, 7 insertions, 10 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 |