Description

Reverts the architecture-narrowing changes from #30590 and #30642 that were rushed in to silence Google Play's 16 KB page-size warning for base/lib/x86_64/libconceal.so and base/lib/x86_64/libsecp256k1.so. Google Play extended their compliance deadline, so we have time to fix the underlying 4 KB alignment issue properly instead of shipping fewer ABIs as a workaround.

The structural fixes are tracked separately:

• tech-debt(android): replace react-native-fast-crypto with quick-crypto scrypt to drop libsecp256k1.so #30591 — replace react-native-fast-crypto with react-native-quick-crypto scrypt (drops libsecp256k1.so).
• tech-debt(android): drop Facebook Conceal dependency from react-native-keychain to remove libconceal.so #30592 — drop the Facebook Conceal dependency from react-native-keychain (drops libconceal.so).

Once those land, both .so files disappear for every ABI (including arm64-v8a), which is the real fix Play actually cares about.

What this PR restores

Why revert rather than keep abiFilters for safety?

The abiFilters plumbing isn't harmful when paired with all four ABIs (it would just resolve to all four), but keeping it adds non-obvious build behavior tied to a workaround we're abandoning. Cleaner to fully revert and re-introduce when (if) we narrow ABIs again as a deliberate decision.

Untouched (already untouched by the original PRs)

• android/gradle.properties (default, local dev)
• android/gradle.properties.github (CI E2E)
• android/gradle.properties.github.dual-versions (BrowserStack real-device runs)
• scripts/build.sh -PreactNativeArchitectures=... CLI overrides

Changelog

CHANGELOG entry: null

Related issues

Reverts: #30590, #30642
Tracking the proper fixes: #30591, #30592

Manual testing steps

Feature: Production AAB ships all four ABIs again

  Scenario: A production release build is generated
    Given a clean checkout of this branch
    When the production AAB is built via the standard release workflow
      (cp android/gradle.properties.release android/gradle.properties
       before ./gradlew bundleProdRelease)
    Then `unzip -l app-prod-release.aab | grep '/lib/'` shows
      `lib/arm64-v8a/`, `lib/armeabi-v7a/`, `lib/x86/`, and `lib/x86_64/`
      entries

  Scenario: Local dev unchanged
    Given default android/gradle.properties (unchanged)
    When `yarn android` is run on an x86_64 emulator
    Then app installs and runs as before

  Scenario: CI E2E unchanged
    Given android/gradle.properties.github overlay
    When E2E build runs
    Then x86_64 APK is produced and Detox tests pass

Screenshots/Recordings

Before

Production AAB ships only armeabi-v7a + arm64-v8a. Play 16 KB warning cleared (workaround), but the underlying 4 KB-aligned .so files still ship for arm64-v8a.

After

Production AAB ships all four ABIs again, restoring full device coverage (including Chromebook ARC++ on x86_64). Play 16 KB warning returns for x86_64, but the warning is informational under the extended deadline and the structural fixes (#30591, #30592) are the real path forward.

Pre-merge author checklist

• I've followed MetaMask Contributor Docs and MetaMask Mobile Coding Standards.
• I've completed the PR template to the best of my ability
• I've included tests if applicable — N/A (build-config revert; verification is via the unzip -l check on the produced AAB)
• I've documented my code using JSDoc format if applicable — N/A
• I've applied the right labels on the PR — team-mobile-platform

Performance checks (if applicable)

• I've tested on Android — restores the pre-fix(android): exclude x86_64 ABI from production AAB to resolve Play 16 KB warning #30590 known-good behavior used in production for the prior release.
• I've tested with a power user scenario — N/A (no JS behavior change)
• I've instrumented key operations with Sentry traces — N/A

Pre-merge reviewer checklist

• I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
• I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

Made with Cursor