aboutsummaryrefslogtreecommitdiff
path: root/android-vts
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2019-10-09 09:27:39 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2019-10-09 09:27:39 +0800
commit183c0d4952ea0f2d1bea2f7d623a5745b1da7be5 (patch)
treee2ad91678a49f9857be701df311dc17a9ae08277 /android-vts
parent2fb5047d99ca16690acad096fefa4ef5eac89d92 (diff)
android-vts: update to build vts for android 10 by default
Change-Id: I9a22eb33fca1b6ca1364b10b7af9f8777c418e52 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Diffstat (limited to 'android-vts')
-rwxr-xr-xandroid-vts/builders.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/android-vts/builders.sh b/android-vts/builders.sh
index d09f606a..c632ab7c 100755
--- a/android-vts/builders.sh
+++ b/android-vts/builders.sh
@@ -1,7 +1,9 @@
+# Build Android vts
export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
repo init -u ${ANDROID_MANIFEST_URL} -b ${MANIFEST_BRANCH}
repo sync -j"$(nproc)" -c
+rm -rf out/
mkdir -p pub
repo manifest -r -o pub/pinned-manifest.xml
@@ -21,15 +23,20 @@ make -j"$(nproc)" vts
wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/generic/build-info/public-template.txt -O pub/BUILD-INFO.txt
-# Build Android
cp out/host/linux-x86/vts/android-vts.zip pub/
# Delete sources after build to save space
rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro* out/
+# need to convert '_' to '-'
+# otherwise, aosp_arm64-userdebug will be translated to '~aosp/arm64-userdebug'
+# when upload to snapshot.linaro.org via linaro-cp.py
+# like reported here:
+# https://ci.linaro.org/job/android-cts/20/console
+lunch_target_str=$(echo ${LUNCH_TARGET}|tr '_' '-')
# Publish parameters
cat << EOF > ${WORKSPACE}/publish_parameters
PUB_SRC=${PWD}/pub
-PUB_DEST=/android/${JOB_NAME}/${MANIFEST_BRANCH}/${LUNCH_TARGET}/${BUILD_NUMBER}
+PUB_DEST=/android/${JOB_NAME}/${lunch_target_str}/${BUILD_NUMBER}/${MANIFEST_BRANCH}
PUB_EXTRA_INC=^[^/]+zip
EOF