Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47ea46f8 authored by Jared Duke's avatar Jared Duke Committed by Automerger Merge Worker
Browse files

Merge "Further refine VisibleForTesting rules" am: 7e559f9c am: 9976b4bb am: 25a295e2 

Original change: https://android-review.googlesource.com/c/platform/build/+/2415814



Change-Id: If594908f0db9e3a06a0cb73d8974597cf106a3d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bcef34af 25a295e2

core/proguard.flags

+11 −6
Original line number Diff line number Diff line
@@ -9,14 +9,19 @@ 
# Add this flag in your package's own configuration if it's needed.

#-flattenpackagehierarchy



# Keep classes and methods that have @VisibleForTesting annotations, except in

# intermediate libraries that export those annotations (e.g., androidx, guava).

# This avoids keeping library-specific test code that isn't actually needed

# for platform testing.

# Keep classes and members with the platform-defined @VisibleForTesting annotation.

-keep @com.android.internal.annotations.VisibleForTesting class *

-keepclassmembers class * {

    @com.android.internal.annotations.VisibleForTesting *;

}



# Keep classes and members with non-platform @VisibleForTesting annotations, but

# only within platform-defined packages. This avoids keeping external, library-specific

# test code that isn't actually needed for platform testing.

# TODO(b/239961360): Migrate away from androidx.annotation.VisibleForTesting

# and com.google.common.annotations.VisibleForTesting use in platform code.

-keep @**.VisibleForTesting class !androidx.**,!com.google.common.**,*

-keepclassmembers class !androidx.**,!com.google.common.**,* {

-keep @**.VisibleForTesting class android.**,com.android.**,com.google.android.**

-keepclassmembers class android.**,com.android.**,com.google.android.** {

    @**.VisibleForTesting *;

}