From 33b78ef2ab845e2b3cd8eb80a978090d4e11dbcb Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 26 Mar 2021 10:31:25 -0700
Subject: Add package.html files to services metalava stubs

Metalava is reading the package.html files without dependencies,
and sandboxing it without providing package.html causes failures.

Bug: 153703940
Test: m services-stubs.sources services-non-updatable-stubs.sources
Change-Id: I4a34252beb17d8a99db1d630018dfe075ace79ba
---
 services/Android.bp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/Android.bp b/services/Android.bp
index 311e87356d78..c160842ee379 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -9,7 +9,10 @@ package {
 
 filegroup {
     name: "services-main-sources",
-    srcs: ["java/**/*.java"],
+    srcs: [
+        "java/**/*.java",
+        "java/**/package.html",
+    ],
     path: "java",
     visibility: ["//visibility:private"],
 }
@@ -19,6 +22,7 @@ filegroup {
     srcs: [
         ":services.core-sources",
         ":services.core-sources-am-wm",
+        "core/java/com/android/server/am/package.html",
         ":services.accessibility-sources",
         ":services.appprediction-sources",
         ":services.appwidget-sources",
-- 
cgit v1.2.3-59-g8ed1b