Skip to content

Conversation

@garanj
Copy link
Contributor

@garanj garanj commented Sep 15, 2025

Fixes obfuscation and optimization issues in the watchface module:

  • The Pack native library was looking for properties of the object being passed in, by name, but in the release build, these were obfuscated, so this was failing. This has been updated to use @JvmField to preserve these names.
  • The release build was optimizing out classes uses in the signing process, the proguard file has been updated and added to the build.gradle.kts
  • Separate watch face signing keys are now used for debug and release builds: As the keys are generated only once, this was causing signing failures when switching between debug and release builds. These are now instead generated once per build type.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @garanj, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses critical issues affecting the "watchface" module's release builds, primarily related to code obfuscation and APK signing. It ensures that the native "Pack" library functions correctly by preserving necessary field names, prevents the build optimizer from removing crucial signing components, and introduces build-type specific signing keys to streamline the development workflow and prevent conflicts.

Highlights

  • Native Library Obfuscation Fix: Applied "@JvmField" annotations to "PackPackage.Resource" properties to prevent obfuscation, ensuring the native "Pack" library can correctly access object properties in release builds.
  • Release Build Optimization for Signing: Updated "proguard-rules.pro" and "build.gradle.kts" to include rules that prevent the Proguard optimizer from stripping out essential classes used in the APK signing process, specifically for BouncyCastle, APK Signer, and XML parsing libraries.
  • Build-Type Specific Signing Keys: Modified the signing key generation logic to use separate keys for debug and release builds, resolving signing failures that occurred when switching between build types.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@garanj garanj changed the title Fixes release obfuscation and optimization issues Fixes watch face release obfuscation and optimization issues Sep 15, 2025
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request effectively addresses several critical issues related to release build obfuscation and optimization in the watchface module. The changes include using @JvmField to prevent obfuscation of fields accessed by native code, adding necessary Proguard rules to prevent stripping of essential classes, and implementing build-type-specific signing keys to resolve signing failures. My review includes a couple of suggestions for improving code structure and encapsulation, but overall the fixes are solid and well-implemented.

@garanj garanj merged commit 72008d4 into android:main Sep 15, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants