Merge "Stop merging in annotations from ojluni-annotated-sdk-stubs"

This commit is contained in:
Treehugger Robot
2019-11-09 11:12:51 +00:00
committed by Gerrit Code Review

View File

@@ -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",
}