From 960c675a831092d221fdcb07c15cb2bfa3a0eeef Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Sat, 2 May 2020 18:00:30 +0100
Subject: [PATCH] Fix last-released check of removed.txt

The last-released checks should check compatibility of the removed.txt
file generated from src with the checked in last-released removed.txt.
It was previously checking compatibility with the checked in removed.txt
at HEAD, which is what check_api is for.

Bug: 155197156
Test: m checkapi
Change-Id: I0f4eca5a30ee13e2c098ccf50e1b992adf4e22cb
---
 StubLibraries.bp    | 6 +++---
 services/Android.bp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 170cac43764a0..91efb05b50f4d 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -110,7 +110,7 @@ droidstubs {
         },
         last_released: {
             api_file: ":android.api.public.latest",
-            removed_api_file: "api/removed.txt",
+            removed_api_file: ":removed.api.public.latest",
             baseline_file: ":public-api-incompatibilities-with-last-released",
         },
         api_lint: {
@@ -152,7 +152,7 @@ droidstubs {
         },
         last_released: {
             api_file: ":android.api.system.latest",
-            removed_api_file: "api/system-removed.txt",
+            removed_api_file: ":removed.api.system.latest",
             baseline_file: ":system-api-incompatibilities-with-last-released"
         },
         api_lint: {
@@ -216,7 +216,7 @@ droidstubs {
         },
         last_released: {
             api_file: ":android.api.module-lib.latest",
-            removed_api_file: "api/module-lib-removed.txt",
+            removed_api_file: ":removed.api.module-lib.latest",
             baseline_file: ":module-lib-api-incompatibilities-with-last-released"
         },
         api_lint: {
diff --git a/services/Android.bp b/services/Android.bp
index 3a6a538df4e3f..a31a483fa9cb6 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -129,7 +129,7 @@ droidstubs {
         },
         last_released: {
             api_file: ":android.api.system-server.latest",
-            removed_api_file: "api/removed.txt",
+            removed_api_file: ":removed.api.system-server.latest",
             baseline_file: ":system-server-api-incompatibilities-with-last-released"
         },
         api_lint: {