From c9545505139ba3d8d886501d5799ca2a471892ac Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 4 Jun 2021 22:23:59 +0100
Subject: [PATCH] Make ApiLint's new_since arg the merged txt file

ApiLint tries to only lint "new" APIs, i.e. those introduced since the
last frozen API. Using android-non-updatable's last frozen txt does not
work well for this, as it is incomplete API surface on its own, so
metalava cannot see all APIs that were present in the previous API
(such as methods inherited from ART), and so makes the wrong decisions
for which APIs are new.

Bug: 171506470
Test: m checkapi
Change-Id: I00d25f2ae0ba8f0ee6fa8564d86642efd74e0d44
Merged-In: I00d25f2ae0ba8f0ee6fa8564d86642efd74e0d44
(cherry picked from commit 4f90aa5148544f3bf9edebb68e02966f69a3ae03)
---
 StubLibraries.bp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index e194c47e8f9cb..5f42019bc7434 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -54,7 +54,7 @@ droidstubs {
         },
         api_lint: {
             enabled: true,
-            new_since: ":android-non-updatable.api.public.latest",
+            new_since: ":android.api.public.latest",
         },
     },
     dists: [
@@ -109,7 +109,7 @@ droidstubs {
         },
         api_lint: {
             enabled: true,
-            new_since: ":android-non-updatable.api.system.latest",
+            new_since: ":android.api.system.latest",
             baseline_file: "core/api/system-lint-baseline.txt",
         },
     },
@@ -204,7 +204,7 @@ droidstubs {
         },
         api_lint: {
             enabled: true,
-            new_since: ":android-non-updatable.api.module-lib.latest",
+            new_since: ":android.api.module-lib.latest",
         },
     },
     dists: [