commit ac048ae9ca98e60f4923cd7900bfeff604c4a5f4
author Martin Stjernholm <mast@google.com> Mon Jun 22 14:38:11 2020 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 24 14:11:35 2020 +0000
tree 0cfb57359b0c47e2ca30f0816adce9c9b07d85e4
parent a5ed9a16c0bd4f0571b4d9fff951257d638b1199

Avoid stderr warnings from Bionic in the run tests (reland).

system/usr/share/zoneinfo/tzdata is created when Bionic is compiled
from source, but not when the prebuilt is used.

This relands https://r.android.com/1344561.

Bug: 159355595
Test: art/test/testrunner/testrunner.py \
      --target --64 --optimizing -t 933
  in device chroot with and without Bionic prebuilt SDK (WIP)
Change-Id: If3d0a085e0bbd61e4b34e96820caeca27f52b00f

tools/buildbot-build.sh

diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index 9f2b9a8..e352fab 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -188,6 +188,14 @@
     done
   done
 
+  # TODO(b/159355595): Ensure there is a tzdata in system to avoid warnings on
+  # stderr from Bionic.
+  if [ ! -f $ANDROID_PRODUCT_OUT/system/usr/share/zoneinfo/tzdata ]; then
+    mkdir -p $ANDROID_PRODUCT_OUT/system/usr/share/zoneinfo
+    cp $ANDROID_PRODUCT_OUT/system/apex/com.android.tzdata/etc/tz/tzdata \
+      $ANDROID_PRODUCT_OUT/system/usr/share/zoneinfo/tzdata
+  fi
+
   # Create linker config files. We run linkerconfig on host to avoid problems
   # building it statically for device in an unbundled tree.