aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-01-15 22:01:01 +0200
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-01-15 22:01:01 +0200
commitf3b0bcdbb7c68d3cfc095d5d350e96b416fe0f5f (patch)
tree228c15ae4bf79699a4d9a8055a8fbc949b55e146
parent7f992cad9b8e520b838a76d827cddc9064b8b3fe (diff)
downloadl-a-b-VPS-f3b0bcdbb7c68d3cfc095d5d350e96b416fe0f5f.tar.gz
Use TARGET_OUT_DIR for BUILD_COPYCAT too.
Change-Id: I9aaaef5ed40061c23a8e9e630f61b94c1bc93cd1
-rw-r--r--build-scripts/build-android6
-rw-r--r--build-scripts/helpers2
2 files changed, 4 insertions, 4 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android
index 6a18746..b7ea895 100644
--- a/build-scripts/build-android
+++ b/build-scripts/build-android
@@ -24,6 +24,9 @@ source "${BUILD_SCRIPT_ROOT}"/helpers
trap infrastructure_error ERR
+# Set TARGET_OUT_DIR since few TARGET_PRODUCT include "full_" keyword as well
+TARGET_OUT_DIR=`echo $TARGET_PRODUCT | sed "s/.*_//g"`
+
if [ -n "$BUILD_COPYCAT" ]; then
download_another_build "$BUILD_COPYCAT"
@@ -134,9 +137,6 @@ else
fi
-# Set TARGET_OUT_DIR since few TARGET_PRODUCT include "full_" keyword as well
-TARGET_OUT_DIR=`echo $TARGET_PRODUCT | sed "s/.*_//g"`
-
# Create filesystem images
if [ -n "$BUILD_FS_IMAGE" ]; then
FS_IMAGE_SIZE=${FS_IMAGE_SIZE-2G}
diff --git a/build-scripts/helpers b/build-scripts/helpers
index 7e7a7eb..507b9cb 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_PRODUCT
+ local dir=out/target/product/$TARGET_OUT_DIR
mkdir -p $dir
pushd $dir
wget -nv --no-check-certificate "$baseurl/boot.tar.bz2" || true