diff options
| -rw-r--r-- | build-scripts/build-android | 15 | ||||
| -rw-r--r-- | build-scripts/helpers | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index 7130dd1..ab4b291 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -134,24 +134,27 @@ else fi +# Set TARGET_OUT_DIR since few TARGET_PRODUCT include "full_" keyword as well +TARGET_OUT_DIR=`echo $TARGET_PRODUCT | sed "s/full_//g"` + # Create filesystem images 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_PRODUCT/system.tar.bz2 \ - --userdata $PWD/out/target/product/$TARGET_PRODUCT/userdata.tar.bz2 \ - --boot $PWD/out/target/product/$TARGET_PRODUCT/boot.tar.bz2 \ + --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 \ --image-size "$FS_IMAGE_SIZE" \ - --image-file out/target/product/$TARGET_PRODUCT/$TARGET_PRODUCT.img + --image-file out/target/product/$TARGET_OUT_DIR/$TARGET_PRODUCT.img bzip2 -9 out/target/product/$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_PRODUCT/obj/kernel/.config" ]; then - cp "out/target/product/$TARGET_PRODUCT/obj/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 fi # Create md5sums file for platform artifacts (cd out/target/product/*/; md5sum *.tar.bz2 *.img >MD5SUMS) || true diff --git a/build-scripts/helpers b/build-scripts/helpers index 1137b3e..7e7a7eb 100644 --- a/build-scripts/helpers +++ b/build-scripts/helpers @@ -137,7 +137,7 @@ download_another_build () { flatten_artifacts () { if [ "$FLATTEN_ARTIFACTS" != "0" ]; then - mv out/target/product/$TARGET_PRODUCT/* out/ + mv out/target/product/$TARGET_OUT_DIR/* out/ rm -r out/target fi } |