summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pete Gillin <peteg@google.com> 2018-09-18 11:01:52 -0700
committer android-build-merger <android-build-merger@google.com> 2018-09-18 11:01:52 -0700
commit59fa25a5f59f97cfc001bf3d1492d37f7897eac5 (patch)
treea3e0470b21acc40048235bd816133af151b83684
parenta92c1c577d678e1ebcb99d571bd65b8e54a4a42b (diff)
parentcddbd39be7647442bd4ed44a1b2a2dd1f925bd8b (diff)
Merge "Rename the ojluni-annotated-stubs target." am: 542d032f03
am: cddbd39be7 Change-Id: I2c512a54b8bb3a0824ea1c279ca67e52a23f4a18
-rw-r--r--Android.bp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 6bc0e9eb04b8..e19827eef5b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",
}