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"

Browse Source 
am: 1a2b940646

Change-Id: I38a29f41c6716804dfea3216c48f8b339f439f0f
This commit is contained in:
Paul Duffin
2019-11-11 09:01:00 -08:00
committed by android-build-merger
parent 337b8a6185 1a2b940646
commit 2795f9dd92
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", previous_api: ":last-released-public-api",
merge_annotations_dirs: [ merge_annotations_dirs: [
"metalava-manual", "metalava-manual",
"ojluni-annotated-sdk-stubs",
], ],
} }
@@ -1077,7 +1076,6 @@ stubs_defaults {
previous_api: ":last-released-public-api", previous_api: ":last-released-public-api",
merge_annotations_dirs: [ merge_annotations_dirs: [
"metalava-manual", "metalava-manual",
"ojluni-annotated-sdk-stubs",
], ],
api_levels_annotations_enabled: true, api_levels_annotations_enabled: true,
api_levels_annotations_dirs: [ api_levels_annotations_dirs: [
@@ -1412,7 +1410,6 @@ droidstubs {
previous_api: ":last-released-public-api", previous_api: ":last-released-public-api",
merge_annotations_dirs: [ merge_annotations_dirs: [
"metalava-manual", "metalava-manual",
"ojluni-annotated-sdk-stubs",
], ],
args: " --show-annotation android.annotation.SystemApi", args: " --show-annotation android.annotation.SystemApi",
} }