From bf4ce755efb00686caf10633df83a7f8a1287c62 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Wed, 8 Feb 2023 12:46:06 -0800
Subject: [PATCH] Use api_levels_remove_references_to_missing_classes property

This is necessary to add the the module-lib and system-server
api levels modules because metalava will start enforcing that
there's no missing classes.

Bug: 193460475
Test: m sdk dist
Change-Id: I94348a656b402fbffd44c3aaedfc836f61f9509d
---
 StubLibraries.bp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index fc046fb2486fe..d043464699e95 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -530,11 +530,17 @@ droidstubs {
     extensions_info_file: ":sdk-extensions-info",
 }
 
+// This module can be built with:
+// m out/soong/.intermediates/frameworks/base/api_versions_module_lib/android_common/metalava/api-versions.xml
 droidstubs {
     name: "api_versions_module_lib",
     srcs: [":android_module_stubs_current_with_test_libs{.jar}"],
     generate_stubs: false,
     api_levels_annotations_enabled: true,
+    // this only has the non-updatable portions of the module lib sdk,
+    // which can reference classes from updatable apexes, so remove references to them
+    // from this api_versions file.
+    flags: ["--remove-missing-class-references-in-api-levels"],
     api_levels_annotations_dirs: [
         "sdk-dir",
         "api-versions-jars-dir",
@@ -548,6 +554,10 @@ droidstubs {
     srcs: [":android_system_server_stubs_current_with_test_libs{.jar}"],
     generate_stubs: false,
     api_levels_annotations_enabled: true,
+    // this only has the non-updatable portions of the system server sdk,
+    // which can reference classes from updatable apexes, so remove references to them
+    // from this api_versions file.
+    flags: ["--remove-missing-class-references-in-api-levels"],
     api_levels_annotations_dirs: [
         "sdk-dir",
         "api-versions-jars-dir",