Revert "Avoid stderr warnings from Bionic in the run tests."
Reason for revert: Breaks several test systems that need TARGET_BUILD_UNBUNDLED.
Reverted Changes:
I0a5023be9:Add scaffolding for Runtime (Bionic) SDK.
I085dc634a:Enable TARGET_BUILD_UNBUNDLED in master-art.
I2f68dff3e:Avoid stderr warnings from Bionic in the run tests...
I98f93d501:Drop Bionic from the tree - should now use prebuil...
I9c5c7edd4:Use prebuilt Runtime (Bionic) APEX and SDK (reland...
Id6513d953:Update mainline prebuilts to build 6582130.
Change-Id: Ia133eb89afc4754d148ac945937305d004771ece
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index e352fab..9f2b9a8 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -188,14 +188,6 @@
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.