Merge "Rename the ojluni-annotated-stubs target." am: 542d032f03

am: cddbd39be7

Change-Id: I2c512a54b8bb3a0824ea1c279ca67e52a23f4a18
This commit is contained in:
Pete Gillin
2018-09-18 11:01:52 -07:00
committed by android-build-merger

View File

@@ -1152,7 +1152,7 @@ stubs_defaults {
previous_api: ":last-released-public-api",
merge_annotations_dirs: [
"metalava-manual",
"ojluni-annotated-stubs",
"ojluni-annotated-sdk-stubs",
],
}
@@ -1214,7 +1214,7 @@ stubs_defaults {
previous_api: ":last-released-public-api",
merge_annotations_dirs: [
"metalava-manual",
"ojluni-annotated-stubs",
"ojluni-annotated-sdk-stubs",
],
}
@@ -1485,7 +1485,7 @@ droidstubs {
previous_api: ":last-released-public-api",
merge_annotations_dirs: [
"metalava-manual",
"ojluni-annotated-stubs",
"ojluni-annotated-sdk-stubs",
],
args: " --show-annotation android.annotation.SystemApi",
}