sentry: Re-enable Sentry again (on Android)

This reverts commit e8c57e7, except for its updates to the changelog. Fixes: #5766
zulip · Oct 5, 2023 · f792c39 · f792c39
1 parent 1510bd3
commit f792c39
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/docs/howto/release.md b/docs/howto/release.md
@@ -102,9 +102,12 @@ simple terminology for the process we follow with both.
   tools/checkout-keystore
   ```
 
-* Do *not* apply the Sentry client key from the `release-secrets`
-  branch; if you're already on that branch (from e.g. making the iOS
-  build), move off of it.  See our issues #5757 and #5766.
+* Apply the Sentry client key (using the local branch created for this
+  in initial setup):
+
+  ```
+  git rebase @ release-secrets
+  ```
 
 * Build the app, as both good old-fashioned APKs and a fancy new AAB:
 

diff --git a/tools/android b/tools/android
@@ -64,16 +64,14 @@ do_apk() {
     check_yarn_link
     run_visibly yarn
 
-    # TODO(#5766): start passing -Psentry again
-    run_visibly tools/gradle :app:assembleRelease -Psigned
+    run_visibly tools/gradle :app:assembleRelease -Psigned -Psentry
 }
 
 do_aab() {
     check_yarn_link
     run_visibly yarn
 
-    # TODO(#5766): start passing -Psentry again
-    run_visibly tools/gradle :app:bundleRelease -Psigned
+    run_visibly tools/gradle :app:bundleRelease -Psigned -Psentry
 }
 
 case "${action}" in