summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2022-07-05 18:31:03 +0530
committerAmit Pundir <amit.pundir@linaro.org>2022-07-05 18:38:39 +0530
commit815210a13a6b40d61717fe5556e1de7f8392df41 (patch)
tree2de234b83f9d9cf151d33a7d9bcee011298abce4
parent26982540bdbbe19318ab6fb9ecabfb472f6afb39 (diff)
downloadhikey-815210a13a6b40d61717fe5556e1de7f8392df41.tar.gz
fetch-vendor-package.sh: Remove the older vendor-package
Remove the older Linaro vendor-package, if any, before downloading/installing the new package. Because upstream mesa prebuilts in vendor-package ain't declared within a contained namespace and we can run into build errors because of redefinition of mesa prebuilt modules from the previous vendor-package. This is hopefully a temporary workaround while we move Mesa prebuilt targets from Android.mk to Android.bp. Signed-off-by: Amit Pundir <amit.pundir@linaro.org> Change-Id: I86709b9c6f07c2e4753e17eda2a3e90e41ba4184
-rwxr-xr-xfetch-vendor-package.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/fetch-vendor-package.sh b/fetch-vendor-package.sh
index cbadbdeb..0a50853c 100755
--- a/fetch-vendor-package.sh
+++ b/fetch-vendor-package.sh
@@ -13,6 +13,14 @@ PKG_FILE=extract-linaro_devices-${EXPECTED_LINARO_VENDOR_VERSION}
pushd ${ANDROID_BUILD_TOP}
+# remove the older vendor-package, if any, because upstream
+# mesa prebuilts in linaro-vendor-package ain't declared
+# within a contained namespace and we can run into build
+# errors because of redefinition of mesa prebuilt modules
+# from the previous vendor-package.
+# FIXME move mesa prebuilts from Android.mk to Android.bp
+rm -rf ${ANDROID_BUILD_TOP}/vendor/linaro/
+
if [ ! -e "${PKG_FILE}.tgz" ]; then
curl -L ${VND_PKG_URL} -o ${PKG_FILE}.tgz
fi