diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-11-11 09:01:00 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-11 09:01:00 -0800 |
| commit | 2795f9dd92b4ae4142492b70a5541aca0f14fdb3 (patch) | |
| tree | 4db1d3bc31dc2b842108f71fc0cad4420de77dd8 | |
| parent | 337b8a618516d1af8aa088929cad868e44963f58 (diff) | |
| parent | 1a2b94064622d5c4333a065781b781868afa2d35 (diff) | |
| download | base-2795f9dd92b4ae4142492b70a5541aca0f14fdb3.tar.gz | |
Merge "Stop merging in annotations from ojluni-annotated-sdk-stubs"
am: 1a2b940646
Change-Id: I38a29f41c6716804dfea3216c48f8b339f439f0f
| -rw-r--r-- | Android.bp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index b546430686b5..284e7015c115 100644 --- a/Android.bp +++ b/Android.bp @@ -1020,7 +1020,6 @@ stubs_defaults { previous_api: ":last-released-public-api", merge_annotations_dirs: [ "metalava-manual", - "ojluni-annotated-sdk-stubs", ], } @@ -1077,7 +1076,6 @@ stubs_defaults { previous_api: ":last-released-public-api", merge_annotations_dirs: [ "metalava-manual", - "ojluni-annotated-sdk-stubs", ], api_levels_annotations_enabled: true, api_levels_annotations_dirs: [ @@ -1412,7 +1410,6 @@ droidstubs { previous_api: ":last-released-public-api", merge_annotations_dirs: [ "metalava-manual", - "ojluni-annotated-sdk-stubs", ], args: " --show-annotation android.annotation.SystemApi", } |