Migrate the keep annotation library to the androidx.annotation.keep namespace [392865072]

Assigned

Bug

Status Update

No update yet.

Description

sg...@google.com

created issue #1

Jan 28, 2025 03:51PM

To publish the keep annotations as a Jetpack library they must be moved to the androidx namespace. The namespace androidx.annotation.keep will be used.

As keep annotations are already used by Android Platform in the current com.android.tools.r8.keepanno.annotations namespace R8 will have to support both.

Comments

ap...@google.com <ap...@google.com> #2Feb 6, 2025 10:28AM

Hello,

Thank you for reaching out to us with your request.

We have duly noted your feedback and will thoroughly validate it. While we cannot provide an estimated time of implementation or guarantee the fulfillment of the issue, please be assured that your input is highly valued. Your feedback enables us to enhance our products and services.

We appreciate your continued trust and support in improving our Google Cloud Platform products. In case you want to report a new issue, Please do not hesitate to create a new issue on the Issue Tracker providing a detailed description of your issue.

Once again, we sincerely appreciate your valuable feedback; Thank you for your understanding and collaboration.

ap...@google.com <ap...@google.com> #3Feb 7, 2025 07:32AM

Thank you for your help.
Will be any communication to me when google starts working on this feature?

ap...@google.com <ap...@google.com> #4Feb 10, 2025 08:25AM

Project: r8
Branch: main
Author: Søren Gjesse <sgjesse@google.com>
Link: https://r8-review.googlesource.com/101320

Don't include classes in androidx.annotaion.keep in r8.jar

Expand for full commit details

Don't include classes in androidx.annotaion.keep in r8.jar 
 
They were already excluded from r8lib.jar. 
 
Bug: b/392865072 
Change-Id: Id64a214a1f1b09232180ded251fe19619773bb1f

Files:

M d8_r8/main/build.gradle.kts

Hash: 3ae34a469f93cacb7d90ff18122ba54a3a396b03
Date: Mon Feb 10 09:20:23 2025

ap...@google.com <ap...@google.com> #5Feb 11, 2025 04:08PM

Project: r8
Branch: main
Author: Søren Gjesse <sgjesse@google.com>
Link: https://r8-review.googlesource.com/101240

Support multiple keep annotation namespaces

Expand for full commit details

Support multiple keep annotation namespaces 
 
With this change the keep annotations can be in either the current 
com.android.tools.r8.keepanno namespace or in the new 
androidx.annoataion.keep namespace. The compiler will treat both 
namespaces the same, and annotations from both namespaces can be 
present at the same time. 
 
The support for the new namespace is needed to be able to release the 
keep annotation library and the support for both is required for 
migrating the use of keep annotations in android platform. 
 
Bug: b/392865072 
 
Change-Id: I173c630269731037e865dbd4b55800862647f563

Files:

M src/keepanno/java/com/android/tools/r8/keepanno/asm/KeepConstraintsVisitor.java
M src/keepanno/java/com/android/tools/r8/keepanno/asm/KeepEdgeReader.java
M src/keepanno/java/com/android/tools/r8/keepanno/ast/AnnotationConstants.java
M src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnFieldsTest.java
M src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMembersTest.java
M src/test/java/com/android/tools/r8/keepanno/KeepAccessFlagsOnMethodsTest.java
M src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBase.java
M src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBuilder.java
M src/test/java/com/android/tools/r8/keepanno/utils/KeepItemAnnotationGenerator.java
M src/test/testbase/java/com/android/tools/r8/R8PartialTestBuilder.java
M src/test/testbase/java/com/android/tools/r8/R8TestBuilder.java
M src/test/testbase/java/com/android/tools/r8/keepanno/KeepAnnoTestUtils.java

Hash: 3f4bf6d8578f4210176691915322d6da96117c08
Date: Tue Feb 11 11:09:19 2025

ap...@google.com <ap...@google.com> #6Feb 12, 2025 03:42PM

Project: r8
Branch: main
Author: Søren Gjesse <sgjesse@google.com>
Link: https://r8-review.googlesource.com/101500

Fix keepanno test

Expand for full commit details

Fix keepanno test 
 
Test was passed the wrong keepanno library for embedded Java 
compilation. 
 
Bug: b/392865072 
Change-Id: I33e41a8cfb35507acd109ce39746fb5570cc49f0

Files:

M src/test/java/com/android/tools/r8/keepanno/api/genericsignature/KeepGenericSignaturesApiTest.java

Hash: 6395b5b9bbfa663fd84d526b551ea4ab97cd9ccf
Date: Wed Feb 12 13:53:04 2025

ap...@google.com <ap...@google.com> #7Feb 13, 2025 09:49AM

Project: r8
Branch: main
Author: Søren Gjesse <sgjesse@google.com>
Link: https://r8-review.googlesource.com/101400

Copy two keep annotations tests to use androidx annotations

Expand for full commit details

Copy two keep annotations tests to use androidx annotations 
 
Bug: b/392865072 
 
Change-Id: I9e1b8126aca58a29f29b217eb8b425dd779ac008

Files:

A src/test/java/com/android/tools/r8/keepanno/androidx/AnnotationPatternAnyRetentionTest.java
A src/test/java/com/android/tools/r8/keepanno/androidx/AnnotationPatternClassRetentionTest.java

Hash: f32e607ff5166092e85b065cf6db7a3fa2cff477
Date: Tue Feb 11 12:34:39 2025

ap...@google.com <ap...@google.com> #8Feb 20, 2025 08:32AM

Project: r8
Branch: main
Author: Søren Gjesse <sgjesse@google.com>
Link: https://r8-review.googlesource.com/101646

Change the keep annotations in the androidx namespace to Kotlin source

Expand for full commit details

Change the keep annotations in the androidx namespace to Kotlin source 
 
Bug: b/392865072 
 
Change-Id: I2df023091929792b5f89b1661a94a05c54b73b5f

Files:

D src/keepanno/java/androidx/annotation/keep/AnnotationPattern.java
A src/keepanno/java/androidx/annotation/keep/AnnotationPattern.kt
M src/keepanno/java/androidx/annotation/keep/CheckOptimizedOut.kt
M src/keepanno/java/androidx/annotation/keep/CheckRemoved.kt
M src/keepanno/java/androidx/annotation/keep/ClassAccessFlags.kt
D src/keepanno/java/androidx/annotation/keep/ClassNamePattern.java
A src/keepanno/java/androidx/annotation/keep/ClassNamePattern.kt
M src/keepanno/java/androidx/annotation/keep/FieldAccessFlags.kt
M src/keepanno/java/androidx/annotation/keep/InstanceOfPattern.kt
D src/keepanno/java/androidx/annotation/keep/KeepBinding.java
A src/keepanno/java/androidx/annotation/keep/KeepBinding.kt
D src/keepanno/java/androidx/annotation/keep/KeepCondition.java
A src/keepanno/java/androidx/annotation/keep/KeepCondition.kt
M src/keepanno/java/androidx/annotation/keep/KeepConstraint.kt
M src/keepanno/java/androidx/annotation/keep/KeepEdge.kt
D src/keepanno/java/androidx/annotation/keep/KeepForApi.java
A src/keepanno/java/androidx/annotation/keep/KeepForApi.kt
M src/keepanno/java/androidx/annotation/keep/KeepItemKind.kt
M src/keepanno/java/androidx/annotation/keep/KeepOption.kt
D src/keepanno/java/androidx/annotation/keep/KeepTarget.java
A src/keepanno/java/androidx/annotation/keep/KeepTarget.kt
M src/keepanno/java/androidx/annotation/keep/MemberAccessFlags.kt
M src/keepanno/java/androidx/annotation/keep/MethodAccessFlags.kt
D src/keepanno/java/androidx/annotation/keep/StringPattern.java
A src/keepanno/java/androidx/annotation/keep/StringPattern.kt
D src/keepanno/java/androidx/annotation/keep/TypePattern.java
A src/keepanno/java/androidx/annotation/keep/TypePattern.kt
D src/keepanno/java/androidx/annotation/keep/UsedByNative.java
A src/keepanno/java/androidx/annotation/keep/UsedByNative.kt
D src/keepanno/java/androidx/annotation/keep/UsedByReflection.java
A src/keepanno/java/androidx/annotation/keep/UsedByReflection.kt
M src/keepanno/java/androidx/annotation/keep/UsesReflection.kt
M src/test/java/com/android/tools/r8/keepanno/utils/KeepItemAnnotationGenerator.java

Hash: 495b038bd4fbe577e1000f2ce057c25baf94fd7f
Date: Wed Feb 19 16:59:13 2025

ap...@google.com <ap...@google.com> #9Feb 20, 2025 12:53PM

Project: r8
Branch: main
Author: Søren Gjesse <sgjesse@google.com>
Link: https://r8-review.googlesource.com/101647

Add support for tests using androidx keep annotations

Expand for full commit details

Add support for tests using androidx keep annotations 
 
Bug: b/392865072 
Change-Id: I640b6f59b08e2a18cc9e9409562bffc54ec0f1bd

Files:

M d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
M d8_r8/main/build.gradle.kts
M d8_r8/test/build.gradle.kts
M d8_r8/test_modules/tests_bootstrap/build.gradle.kts
M d8_r8/test_modules/tests_java_8/build.gradle.kts
M src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBuilder.java
M src/test/testbase/java/com/android/tools/r8/keepanno/KeepAnnoTestUtils.java

Hash: 97a7f8da5506049016632cfeeb06e92dc1623881
Date: Thu Feb 20 13:22:16 2025

ap...@google.com <ap...@google.com> #10Feb 24, 2025 10:13AM

Project: r8
Branch: main
Author: Søren Gjesse <sgjesse@google.com>
Link: https://r8-review.googlesource.com/101801

Reapply "Add support for tests using androidx keep annotations"

Expand for full commit details

Reapply "Add support for tests using androidx keep annotations" 
 
This reverts commit 809cceb4534e1a1f1ca446a32bfa9fef13656cd2. 
 
Reapply "Change the keep annotations in the androidx namespace to Kotlin source" 
 
This reverts commit 8c2c3b1010ec081f0af519b8f8903d90229acde0. 
 
With additional fix for SanityCheck. 
 
Bug: b/392865072 
Change-Id: I0d5dc671c4a7ea08960d92c28b5edf30e0e89627

Files:

M d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
M d8_r8/main/build.gradle.kts
M d8_r8/test/build.gradle.kts
M d8_r8/test_modules/tests_bootstrap/build.gradle.kts
M d8_r8/test_modules/tests_java_8/build.gradle.kts
D src/keepanno/java/androidx/annotation/keep/AnnotationPattern.java
A src/keepanno/java/androidx/annotation/keep/AnnotationPattern.kt
M src/keepanno/java/androidx/annotation/keep/CheckOptimizedOut.kt
M src/keepanno/java/androidx/annotation/keep/CheckRemoved.kt
M src/keepanno/java/androidx/annotation/keep/ClassAccessFlags.kt
D src/keepanno/java/androidx/annotation/keep/ClassNamePattern.java
A src/keepanno/java/androidx/annotation/keep/ClassNamePattern.kt
M src/keepanno/java/androidx/annotation/keep/FieldAccessFlags.kt
M src/keepanno/java/androidx/annotation/keep/InstanceOfPattern.kt
D src/keepanno/java/androidx/annotation/keep/KeepBinding.java
A src/keepanno/java/androidx/annotation/keep/KeepBinding.kt
D src/keepanno/java/androidx/annotation/keep/KeepCondition.java
A src/keepanno/java/androidx/annotation/keep/KeepCondition.kt
M src/keepanno/java/androidx/annotation/keep/KeepConstraint.kt
M src/keepanno/java/androidx/annotation/keep/KeepEdge.kt
D src/keepanno/java/androidx/annotation/keep/KeepForApi.java
A src/keepanno/java/androidx/annotation/keep/KeepForApi.kt
M src/keepanno/java/androidx/annotation/keep/KeepItemKind.kt
M src/keepanno/java/androidx/annotation/keep/KeepOption.kt
D src/keepanno/java/androidx/annotation/keep/KeepTarget.java
A src/keepanno/java/androidx/annotation/keep/KeepTarget.kt
M src/keepanno/java/androidx/annotation/keep/MemberAccessFlags.kt
M src/keepanno/java/androidx/annotation/keep/MethodAccessFlags.kt
D src/keepanno/java/androidx/annotation/keep/StringPattern.java
A src/keepanno/java/androidx/annotation/keep/StringPattern.kt
D src/keepanno/java/androidx/annotation/keep/TypePattern.java
A src/keepanno/java/androidx/annotation/keep/TypePattern.kt
D src/keepanno/java/androidx/annotation/keep/UsedByNative.java
A src/keepanno/java/androidx/annotation/keep/UsedByNative.kt
D src/keepanno/java/androidx/annotation/keep/UsedByReflection.java
A src/keepanno/java/androidx/annotation/keep/UsedByReflection.kt
M src/keepanno/java/androidx/annotation/keep/UsesReflection.kt
M src/test/java/com/android/tools/r8/keepanno/KeepAnnoTestBuilder.java
M src/test/java/com/android/tools/r8/keepanno/utils/KeepItemAnnotationGenerator.java
M src/test/testbase/java/com/android/tools/r8/keepanno/KeepAnnoTestUtils.java

Hash: 43a167895d472f8c7b189792465e333be27644f8
Date: Mon Feb 24 09:19:24 2025

ap...@google.com <ap...@google.com> #11Feb 26, 2025 08:36AM

Project: r8
Branch: main
Author: Søren Gjesse <sgjesse@google.com>
Link: https://r8-review.googlesource.com/102000

Fix keepanno tests on Windows

Expand for full commit details

Fix keepanno tests on Windows 
 
Bug: b/392865072 
Change-Id: I9b9e77bebba2e5045e9820586684c29b7940ec15

Files:

M d8_r8/test/build.gradle.kts
M d8_r8/test_modules/tests_bootstrap/build.gradle.kts
M d8_r8/test_modules/tests_java_8/build.gradle.kts

Hash: 58e4d0cc904b418696e53b841e1b2d2d50d3ec2b
Date: Wed Feb 26 09:27:30 2025

ap...@google.com <ap...@google.com> #12Feb 26, 2025 08:48AM

Project: r8
Branch: main
Author: Søren Gjesse <sgjesse@google.com>
Link: https://r8-review.googlesource.com/102020

Remove superfluous comma breaking the build

Expand for full commit details

Remove superfluous comma breaking the build 
 
Bug: b/392865072 
Change-Id: If986193b3cd15936779b8975f5a9b7f0408c9411

Files:

M d8_r8/test_modules/tests_bootstrap/build.gradle.kts

Hash: 8479208f2bbad408bdbbeeafbe35cfd7b7e17991
Date: Wed Feb 26 09:44:17 2025

ap...@google.com <ap...@google.com> #13Feb 27, 2025 08:22AM

Project: r8
Branch: main
Author: Søren Gjesse <sgjesse@google.com>
Link: https://r8-review.googlesource.com/102080

Fix another hardcoded / in path operations for Windows tests

Expand for full commit details

Fix another hardcoded / in path operations for Windows tests 
 
Bug: b/392865072 
Change-Id: I34d2a6274f0fe31e08c103941cd2aff31d2f6d1a

Files:

M d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt

Hash: 331f35092d93cc8773d11f9c7a40fb5a92bfa1f7
Date: Thu Feb 27 08:59:58 2025

Issue 392865072

Description

Issue summary

Comments

ap...@google.com <ap...@google.com> #2Feb 6, 2025 10:28AM

ap...@google.com <ap...@google.com> #3Feb 7, 2025 07:32AM

ap...@google.com <ap...@google.com> #4Feb 10, 2025 08:25AM

ap...@google.com <ap...@google.com> #5Feb 11, 2025 04:08PM

ap...@google.com <ap...@google.com> #6Feb 12, 2025 03:42PM

ap...@google.com <ap...@google.com> #7Feb 13, 2025 09:49AM

ap...@google.com <ap...@google.com> #8Feb 20, 2025 08:32AM

ap...@google.com <ap...@google.com> #9Feb 20, 2025 12:53PM

ap...@google.com <ap...@google.com> #10Feb 24, 2025 10:13AM

ap...@google.com <ap...@google.com> #11Feb 26, 2025 08:36AM

ap...@google.com <ap...@google.com> #12Feb 26, 2025 08:48AM

ap...@google.com <ap...@google.com> #13Feb 27, 2025 08:22AM

Add comment

Issue metadata