From 9f5cdff6af1544975712cd51013de0319a50a2bf Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Wed, 12 May 2021 10:47:16 +0100
Subject: [PATCH] Add ART module-lib and system API to the collection

Bug: 157639992
Test: m update-api
Merged-In: Icae91fd724dd1f827a61e0a7a248fd1db8532e53
Change-Id: Icae91fd724dd1f827a61e0a7a248fd1db8532e53
(cherry picked from commit d21107a1e8be2a0c34de3ab5ff26c966f4989ce7)
---
 StubLibraries.bp | 2 +-
 api/Android.bp   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index ed24d43eda10e..b6c45eddf92f0 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -255,7 +255,7 @@ modules_public_stubs = [
 
 modules_system_stubs = [
     "android.net.ipsec.ike.stubs.system",
-    "art.module.public.api.stubs", // Only has public stubs
+    "art.module.public.api.stubs.system",
     "conscrypt.module.public.api.stubs", // Only has public stubs
     "framework-appsearch.stubs.system",
     "framework-connectivity.stubs.system",
diff --git a/api/Android.bp b/api/Android.bp
index b85dc46139819..db1f64c57e2c1 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -161,6 +161,7 @@ genrule {
 genrule {
     name: "frameworks-base-api-system-current.txt",
     srcs: [
+        ":art.module.public.api{.system.api.txt}",
         ":android.net.ipsec.ike{.system.api.txt}",
         ":framework-appsearch{.system.api.txt}",
         ":framework-connectivity{.system.api.txt}",
@@ -215,6 +216,7 @@ genrule {
 genrule {
     name: "frameworks-base-api-system-removed.txt",
     srcs: [
+        ":art.module.public.api{.system.removed-api.txt}",
         ":android.net.ipsec.ike{.system.removed-api.txt}",
         ":framework-appsearch{.system.removed-api.txt}",
         ":framework-connectivity{.system.removed-api.txt}",
@@ -251,6 +253,7 @@ genrule {
 genrule {
     name: "frameworks-base-api-module-lib-current.txt",
     srcs: [
+        ":art.module.public.api{.module-lib.api.txt}",
         ":android.net.ipsec.ike{.module-lib.api.txt}",
         ":framework-appsearch{.module-lib.api.txt}",
         ":framework-connectivity{.module-lib.api.txt}",
@@ -307,6 +310,7 @@ genrule {
 genrule {
     name: "frameworks-base-api-module-lib-removed.txt",
     srcs: [
+        ":art.module.public.api{.module-lib.removed-api.txt}",
         ":android.net.ipsec.ike{.module-lib.removed-api.txt}",
         ":framework-appsearch{.module-lib.removed-api.txt}",
         ":framework-connectivity{.module-lib.removed-api.txt}",