123223339: Include type annotations in annotation merger
When reading in annotations from Java stub files, attempt to merge in type annotations as well. Bug: 123223339 Test: Unit test included Change-Id: I289b0a92d8a3741ce6aabdbb5c83b3b3cbcf32d1
Showing
- src/main/java/com/android/tools/metalava/AnnotationsMerger.kt 62 additions, 19 deletions...main/java/com/android/tools/metalava/AnnotationsMerger.kt
- src/main/java/com/android/tools/metalava/model/psi/PsiTypeItem.kt 1 addition, 1 deletion.../java/com/android/tools/metalava/model/psi/PsiTypeItem.kt
- src/test/java/com/android/tools/metalava/AnnotationsMergerTest.kt 62 additions, 15 deletions.../java/com/android/tools/metalava/AnnotationsMergerTest.kt
- src/test/java/com/android/tools/metalava/DriverTest.kt 4 additions, 0 deletionssrc/test/java/com/android/tools/metalava/DriverTest.kt
Loading
Please register or sign in to comment