Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
The annotations are already merged into the stubs that are exported
from libcore so this is unnecessary.

Bug: 142113521
Test: m checkbuild
      test this change does not change offline-sdk-docs
Change-Id: Icb0b61f80c91f96eaa22a7f1b92ffdf1825636c8
This commit is contained in:
Paul Duffin
2019-11-04 10:04:50 +00:00
parent 6e914e8baf
commit 64b7d40250
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.bp
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",
}