Skip to content

fix: preserve Data null sentinels with R8 #2629

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.

Sign up for GitHub

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

Open
arnabnandy7 wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −0
Open

fix: preserve Data null sentinels with R8 #2629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions docs/android.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ public void onCreate(Bundle savedInstanceState) {
Begin by reading the [Android development instructions][http-client-android] for
the Google HTTP Client Library for Java.

## R8 and ProGuard

The `google-api-client` artifact includes consumer rules required by the
library. If your build does not automatically consume rules from dependency
JARs, include the rules from
[`google-api-client.pro`][google-api-client-proguard] in your R8 or ProGuard
configuration.

## Authentication

As described in the [Android development instructions][http-client-android], the
Expand Down Expand Up @@ -75,5 +83,6 @@ if (files == null || files.isEmpty()) {
[play-services]: https://developer.android.com/google/play-services/index.html
[account-manager]: http://developer.android.com/reference/android/accounts/AccountManager.html
[http-client-android]: https://github.com/googleapis/google-http-java-client/wiki/Android
[google-api-client-proguard]: https://github.com/googleapis/google-api-java-client/blob/main/google-api-client/src/main/resources/META-INF/proguard/google-api-client.pro
[oauth2-android]: https://github.com/googleapis/google-api-java-client#oauth2-android
[quickstart]: https://developers.google.com/drive/api/v3/quickstart/java
7 changes: 7 additions & 0 deletions google-api-client-assembly/proguard-google-api-client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
@com.google.api.client.util.Key <fields>;
}

# Data's magic null values rely on reference identity. Keep R8 from replacing
# wrapper instances with canonical values such as Boolean.TRUE.

-keepclassmembers class com.google.api.client.util.Data {
public static final *** NULL_*;
}

# Needed by google-http-client-android when linking against an older platform version

-dontwarn com.google.api.client.extensions.android.**
Expand Down
7 changes: 7 additions & 0 deletions google-api-client/src/main/resources/META-INF/proguard/google-api-client.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
# https://github.com/googleapis/google-api-java-client/issues/1450
-keep public class com.google.api.client.googleapis.GoogleUtils

# Data's magic null values rely on reference identity. Keep R8 from replacing
# wrapper instances with canonical values such as Boolean.TRUE.
# https://github.com/googleapis/google-api-java-client/issues/2603
-keepclassmembers class com.google.api.client.util.Data {
public static final *** NULL_*;
}
Loading