Merge "Stop merging in annotations from ojluni-annotated-sdk-stubs"
This commit is contained in:
@@ -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",
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user