diff options
author | Paul Duffin <paulduffin@google.com> | 2021-04-08 16:22:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-08 16:22:04 +0000 |
commit | e8d7d82d7658d699c03c8b3b377320d2ecdc53b6 (patch) | |
tree | 9d5f5f55f2fc50a9287d24b462d5b9ac7e590545 | |
parent | b7dc8c85ce8c05cc9c47bc8fb7f25ce795480453 (diff) | |
parent | c311b4859dd666cd7141686e4adf9d67b732f3fa (diff) | |
download | dalvik-e8d7d82d7658d699c03c8b3b377320d2ecdc53b6.tar.gz |
Merge "Fix build error due to null annotations in core platform API" am: ddbce35345 am: 8ec9292427 am: c311b4859dandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1670005
Change-Id: Id88ffd24b071e2faddeea67b522ff665f4c25549
-rw-r--r-- | tools/dexdeps/src/Android.bp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/dexdeps/src/Android.bp b/tools/dexdeps/src/Android.bp index 1181bda2b..74879024e 100644 --- a/tools/dexdeps/src/Android.bp +++ b/tools/dexdeps/src/Android.bp @@ -34,5 +34,8 @@ droiddoc { srcs: [ ":dexdeps-doc-stubs", ], + libs: [ + "stub-annotations", + ], custom_template: "droiddoc-templates-sdk", } |