From 3eaee82ad0d1155f299e1276b4fb4c243c98e28f Mon Sep 17 00:00:00 2001
From: Mark White <anothermark@google.com>
Date: Mon, 23 Oct 2023 16:04:53 +0000
Subject: m framework-minus-apex should not build services

Bug: 288868053
Test: verified services not built in build.trace.gz
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:338107bd1f9c74f8ac6144c0bd767e954518f272)
Merged-In: I1eb64da7318d1bad003e71962ca8a90b7229ea49
Change-Id: I1eb64da7318d1bad003e71962ca8a90b7229ea49
---
 Android.bp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/Android.bp b/Android.bp
index ccff26fb70d2..1ec998e0ef43 100644
--- a/Android.bp
+++ b/Android.bp
@@ -370,17 +370,12 @@ java_defaults {
         // TODO(b/120066492): remove default_television.xml when the build system
         // propagates "required" properly.
         "default_television.xml",
-        "framework-platform-compat-config",
         // TODO(b/120066492): remove gps_debug and protolog.conf.json when the build
         // system propagates "required" properly.
         "gps_debug.conf",
-        "icu4j-platform-compat-config",
         "protolog.conf.json.gz",
-        "services-platform-compat-config",
-        "TeleService-platform-compat-config",
-        "documents-ui-compat-config",
-        "calendar-provider-compat-config",
-        "contacts-provider-platform-compat-config",
+        // any install dependencies should go into framework-minus-apex-install-dependencies
+        // rather than here to avoid bloating incremental build time
     ],
     libs: [
         "androidx.annotation_annotation",
@@ -488,6 +483,20 @@ java_library {
     apex_available: ["//apex_available:platform"],
 }
 
+java_library {
+    name: "framework-minus-apex-install-dependencies",
+    required: [
+        "framework-minus-apex",
+        "framework-platform-compat-config",
+        "services-platform-compat-config",
+        "icu4j-platform-compat-config",
+        "TeleService-platform-compat-config",
+        "documents-ui-compat-config",
+        "calendar-provider-compat-config",
+        "contacts-provider-platform-compat-config",
+    ],
+}
+
 platform_compat_config {
     name: "framework-platform-compat-config",
     src: ":framework-minus-apex",
-- 
cgit v1.2.3-59-g8ed1b