Revert "Ignore banned words when uploading to studio and AOSP"
This reverts commit 9beaddf12722f6c100274e13d61cde2a45e56c66.
Revert "Add a bug reference to the use of the option for ignoring banned words"
This reverts commit fd9be47a940a60913517280f22d19d42cc88b289.
Bug: b//260680525
Change-Id: I0e9c9d4057145f6d8c8e2ef572011ca4e47289a1
diff --git a/tools/r8_release.py b/tools/r8_release.py
index fe921e2..78fd031 100755
--- a/tools/r8_release.py
+++ b/tools/r8_release.py
@@ -193,8 +193,7 @@
# Don't upload if requested not to, or if changes are not committed due
# to --use-existing-work-branch
if not options.no_upload and not options.use_existing_work_branch:
- # TODO(b/260680525): Consider removing "-o banned-words~skip" if b/260680525 is resolved.
- process = subprocess.Popen(['repo', 'upload', '.', '--verify', '-o' 'banned-words~skip'],
+ process = subprocess.Popen(['repo', 'upload', '.', '--verify'],
stdin=subprocess.PIPE)
return process.communicate(input=b'y\n')[0]
