Skip to content

Add proguard rule for datatransport runtime [Uplift to 1.58.x] #20163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2023

Conversation

deeppandya
Copy link
Contributor

@deeppandya deeppandya commented Sep 14, 2023

Uplift of #20165
Resolves brave/brave-browser#32988

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@deeppandya deeppandya added CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS CI/skip-windows-x86 CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64 labels Sep 14, 2023
@deeppandya deeppandya added this to the 1.58.x - Release milestone Sep 14, 2023
@deeppandya deeppandya requested a review from a team as a code owner September 14, 2023 05:37
@deeppandya deeppandya self-assigned this Sep 14, 2023
@@ -1,3 +1,5 @@
-keep class com.google.android.datatransport.runtime.scheduling.** { *; }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We needed to add proguard rule because of https://source.chromium.org/chromium/chromium/src/+/main:third_party/angle/third_party/android_deps/buildSrc/src/main/groovy/ChromiumDepGraph.groovy;l=39. and for some reason it seems to be affecting only android 8.

@kjozwiak
Copy link
Member

Both @vlad-hoff & @Uni-verse confirmed that the crash appears to be resolved once they ran through a quick spot check with builds that @deeppandya provided which had the above fix. Because the 1.58.x release is scheduled for tomorrow, we need to get the above into 1.58.x ASPA so we can respin. @vlad-hoff also added the following video via Slack demonstrating that Brave doesn't crash when using VPN on Android 8 as per the following:

timestamp_18-15-31_18-18-10.mp4

@deeppandya
Copy link
Contributor Author

deeppandya commented Sep 14, 2023

Followed the STR from the issue. and it seems to be working as expected. it doesn't crash at all and i was also able to buy the subscription and start the vpn tunnel. Here i have attached the recording with 1.58.123 manual build .

az_recorder_20230914_030029.mp4

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.58.x approved 👍 QA & @deeppandya went through verifications on a PR build as per #20163 (comment) & #20163 (comment).

@kjozwiak kjozwiak merged commit 4758345 into 1.58.x Sep 14, 2023
@kjozwiak kjozwiak deleted the resolve_android_8_vpn_issue branch September 14, 2023 07:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants