From d74139eea75e4835e582ef22c54ad1efd95bbf89 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 8 Oct 2020 14:59:17 +0100
Subject: [PATCH] Add appsearch and graphics to module lists

These two were missing from some of the lists of all modules,
as they either weren't standardized or not available in the branch
where the list was first added.

Bug: 169034951
Test: m
Change-Id: I16c67ef8a433e6720953a2046c09add13a8102ed
---
 StubLibraries.bp | 1 +
 api/Android.bp   | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index d8b4e47578272..1430490dbdf94 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -363,6 +363,7 @@ java_library_static {
     srcs: [ ":api-stubs-docs-non-updatable" ],
     static_libs: [
         "conscrypt.module.public.api.stubs",
+        "framework-appsearch.stubs",
         "framework-graphics.stubs",
         "framework-media.stubs",
         "framework-mediaprovider.stubs",
diff --git a/api/Android.bp b/api/Android.bp
index f0218b84a58a1..3413f8ab0eed2 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -48,6 +48,7 @@ genrule {
     name: "frameworks-base-api-current-merged.txt",
     srcs: [
         ":conscrypt.module.public.api{.public.api.txt}",
+        ":framework-appsearch{.public.api.txt}",
         ":framework-graphics{.public.api.txt}",
         ":framework-media{.public.api.txt}",
         ":framework-mediaprovider{.public.api.txt}",
@@ -67,6 +68,8 @@ genrule {
     name: "frameworks-base-api-removed-merged.txt",
     srcs: [
         ":conscrypt.module.public.api{.public.removed-api.txt}",
+        ":framework-appsearch{.public.removed-api.txt}",
+        ":framework-graphics{.public.removed-api.txt}",
         ":framework-media{.public.removed-api.txt}",
         ":framework-mediaprovider{.public.removed-api.txt}",
         ":framework-permission{.public.removed-api.txt}",
@@ -84,6 +87,7 @@ genrule {
 genrule {
     name: "frameworks-base-api-system-current-merged.txt",
     srcs: [
+        ":framework-appsearch{.system.api.txt}",
         ":framework-graphics{.system.api.txt}",
         ":framework-media{.system.api.txt}",
         ":framework-mediaprovider{.system.api.txt}",
@@ -102,6 +106,8 @@ genrule {
 genrule {
     name: "frameworks-base-api-system-removed-merged.txt",
     srcs: [
+        ":framework-appsearch{.system.removed-api.txt}",
+        ":framework-graphics{.system.removed-api.txt}",
         ":framework-media{.system.removed-api.txt}",
         ":framework-mediaprovider{.system.removed-api.txt}",
         ":framework-permission{.system.removed-api.txt}",
@@ -119,6 +125,7 @@ genrule {
 genrule {
     name: "frameworks-base-api-module-lib-current-merged.txt",
     srcs: [
+        ":framework-appsearch{.module-lib.api.txt}",
         ":framework-graphics{.module-lib.api.txt}",
         ":framework-media{.module-lib.api.txt}",
         ":framework-mediaprovider{.module-lib.api.txt}",
@@ -137,6 +144,8 @@ genrule {
 genrule {
     name: "frameworks-base-api-module-lib-removed-merged.txt",
     srcs: [
+        ":framework-appsearch{.module-lib.removed-api.txt}",
+        ":framework-graphics{.module-lib.removed-api.txt}",
         ":framework-media{.module-lib.removed-api.txt}",
         ":framework-mediaprovider{.module-lib.removed-api.txt}",
         ":framework-permission{.module-lib.removed-api.txt}",