Merge "123223339: Include type annotations in annotation merger" am: 1ff8c824f4 (08e93815) · Commits · CodeLinaro / public-release-test-restored / platform / tools / metalava · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

metalava
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

08e93815

Commit 08e93815 authored 6 years ago by Adrian Roos Committed by android-build-merger 6 years ago

Downloads
- Plain Diff

Merge "123223339: Include type annotations in annotation merger" am: 1ff8c824

am: 466e139c

Change-Id: Iec27c1a44f2b192549d147d0945babc0c93586ad

parents 47a1c8c6 466e139c

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

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 deletions

src/test/java/com/android/tools/metalava/DriverTest.kt

with 129 additions and 35 deletions

Loading

CodeLinaro @codelinaro
mentioned in commit 9914c655
· 9 months ago

mentioned in commit 9914c655

mentioned in commit 9914c6556415c0c005ca40646e92e841e3631271

Toggle commit list

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment