aboutsummaryrefslogtreecommitdiff
path: root/build-scripts
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-01-03 15:35:47 +0200
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-01-03 15:35:47 +0200
commit24fc783b9adaf594ad8b4742afe0258f8650fc4b (patch)
treee839c3273283320f60307dd838daca76ebf68660 /build-scripts
parent5105e2267c13821b6f219c041431e949498bd257 (diff)
Add sypport for flattening artifacts build-side.
This moves flattening to build side instead of publsihing side, per LAVA-933. Change-Id: Ic0d3d6f9598f5538c99c689345ebd9074d063769
Diffstat (limited to 'build-scripts')
-rw-r--r--build-scripts/build-android2
-rw-r--r--build-scripts/helpers7
2 files changed, 9 insertions, 0 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android
index 8468788..6bb7fc7 100644
--- a/build-scripts/build-android
+++ b/build-scripts/build-android
@@ -166,3 +166,5 @@ if [ ! -n "$SKIP_LICENSE_CHECK" ]; then
fi
${BUILD_SCRIPT_ROOT}/../utils/manifest-descriptions/make.sh out/source-manifest.xml out/pinned-manifest.xml
+
+flatten_artifacts
diff --git a/build-scripts/helpers b/build-scripts/helpers
index 6d3f762..698cd19 100644
--- a/build-scripts/helpers
+++ b/build-scripts/helpers
@@ -135,6 +135,13 @@ download_another_build () {
popd
}
+flatten_artifacts () {
+ if [ "$FLATTEN_ARTIFACTS" == "1" ]; then
+ mv out/target/product/$TARGET_PRODUCT/* out/
+ rm -r out/target
+ fi
+}
+
unpack_overlays () {
local ifs_save="$IFS"
IFS=";"