Revert "Reland^2 "Do not create 4-byte sequences in `ConvertUtf16ToModifiedUtf8()`""
This reverts commit 5baa7724fb6ec13674678275ba70b30854a80477.
Reason for revert: Still seems to be triggering test failures. E.g. https://ci.chromium.org/ui/p/art/builders/ci/host-x86_64-cdex-fast/5926/overview
Change-Id: I94ca1dd3bb21b25f94a9a563adc549de55670a80
diff --git a/test/run_test_build.py b/test/run_test_build.py
index fcaf1a5..75cd64f 100755
--- a/test/run_test_build.py
+++ b/test/run_test_build.py
@@ -81,10 +81,7 @@
self.hiddenapi = functools.partial(self.run, args.hiddenapi.absolute())
# RBE wrapper for some of the tools.
- # RBE does not suport non-BMP characters in paths, so exclude "183-non-bmp-package-name".
- # Bug: 264866780
- if ("RBE_server_address" in os.environ and USE_RBE > (hash(self.test_name) % 100) and
- self.test_name != "183-non-bmp-package-name"):
+ if "RBE_server_address" in os.environ and USE_RBE > (hash(self.test_name) % 100):
self.rbe_exec_root = os.environ.get("RBE_exec_root")
self.rbe_rewrapper = self.android_build_top / "prebuilts/remoteexecution-client/live/rewrapper"
if self.test_name not in RBE_D8_DISABLED_FOR:
@@ -105,7 +102,6 @@
"SMALI": args.smali.absolute(),
"SOONG_ZIP": args.soong_zip.absolute(),
"TEST_NAME": self.test_name,
- "LANG": "en_US.UTF-8", # Needed to pass UTF-8 command line arguments.
}
def bash(self, cmd):