commit c62ba18c94081ac77a74148d3e840ed20f3914bc
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Sep 23 19:29:51 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 23 19:29:51 2019 +0000
tree bd02c8a5c15f9da88b225748ee093fb1a67e5634
parent 1bc23a2bb9f5ac76c4fffdd2c1d4d3f84d0c300e
parent 1b51142eb629a300727197f5bebe32c208edb0b6

Merge "Replacing @Nullable with @RecentlyNullable for apis annotated since API 28"

Android.bp

diff --git a/Android.bp b/Android.bp
index bef3251..31dbaad 100644
--- a/Android.bp
+++ b/Android.bp
@@ -931,7 +931,7 @@
         "sdk-dir",
         "api-versions-jars-dir",
     ],
-    previous_api: ":last-released-public-api",
+    previous_api: ":last-released-public-api-for-metalava-annotations",
     merge_annotations_dirs: [
         "metalava-manual",
         "ojluni-annotated-sdk-stubs",
@@ -988,7 +988,7 @@
     local_sourcepaths: frameworks_base_subdirs,
     installable: false,
     annotations_enabled: true,
-    previous_api: ":last-released-public-api",
+    previous_api: ":last-released-public-api-for-metalava-annotations",
     merge_annotations_dirs: [
         "metalava-manual",
         "ojluni-annotated-sdk-stubs",
@@ -1324,7 +1324,7 @@
     installable: false,
     sdk_version: "core_platform",
     annotations_enabled: true,
-    previous_api: ":last-released-public-api",
+    previous_api: ":last-released-public-api-for-metalava-annotations",
     merge_annotations_dirs: [
         "metalava-manual",
         "ojluni-annotated-sdk-stubs",