aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Duraj <julien.duraj@linaro.org>2016-08-08 09:38:21 +0100
committerJulien Duraj <julien.duraj@linaro.org>2016-08-08 09:42:51 +0100
commit3f7a89146de668ddf355086600923d6167117735 (patch)
tree892704214fe2da5b7cc43b3da18b96b3f3aceed1
parentca7b763adbf16a86d6329f11a67056d1eb5bed67 (diff)
downloadart-build-scripts-3f7a89146de668ddf355086600923d6167117735.tar.gz
Support for VIXL where Android.mk needs generating
Change-Id: Ia84d7d8286a9c01ab50717f985254f33b81550b0
-rwxr-xr-xtests/test_art_vixl.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/test_art_vixl.sh b/tests/test_art_vixl.sh
index 932e1725..c6d2010c 100755
--- a/tests/test_art_vixl.sh
+++ b/tests/test_art_vixl.sh
@@ -25,7 +25,7 @@ usage() {
}
test_vixl_selftests() {
- log I "Runing VIXL standalone tests."
+ log I "Running VIXL standalone tests."
if ! (exists scons && exists cpplint.py); then
log E "Missing dependencies! Please take a look at VIXL's README.md."
@@ -33,6 +33,12 @@ test_vixl_selftests() {
fi
safe cd external/vixl
+
+ # For tests on upstream VIXL trees, we want to generate the Android.mk first.
+ if [[ ! -f Android.mk ]]; then
+ safe ./third_party/android/generate_android_mk.py
+ fi
+
# FIXME(Stable): Workaround for the current stable tree that does not have
# a recent VIXL version and thus does not have this file.
# TODO(Stable): When a new stable tree that has a recent version of VIXL