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

Merge "Stop merging in annotations from ojluni-annotated-sdk-stubs" am: 1a2b940646 am: 2795f9dd92

Browse Source 
am: a9b90e91bf

Change-Id: I2aed877054e40ccc0f479194cb38aae0270ceb3f
This commit is contained in:
Paul Duffin
2019-11-11 10:07:51 -08:00
committed by android-build-merger
parent caf996ac7d a9b90e91bf
commit 7de644ffd4
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

@@ -1022,7 +1022,6 @@ stubs_defaults {
previous_api: ":last-released-public-api-for-metalava-annotations",
merge_annotations_dirs: [
"metalava-manual",
"ojluni-annotated-sdk-stubs",
],
}
@@ -1079,7 +1078,6 @@ stubs_defaults {
previous_api: ":last-released-public-api-for-metalava-annotations",
merge_annotations_dirs: [
"metalava-manual",
"ojluni-annotated-sdk-stubs",
],
api_levels_annotations_enabled: true,
api_levels_annotations_dirs: [
@@ -1414,7 +1412,6 @@ droidstubs {
previous_api: ":last-released-public-api-for-metalava-annotations",
merge_annotations_dirs: [
"metalava-manual",
"ojluni-annotated-sdk-stubs",
],
args: " --show-annotation android.annotation.SystemApi",
}