diff options
| author | 2023-10-24 17:10:02 +0000 | |
|---|---|---|
| committer | 2023-10-24 17:10:02 +0000 | |
| commit | bed2522ab5be00a68aaa0e2f1ea9d58c7a8732a3 (patch) | |
| tree | 538d93230c06f66a0fa585c8feea37d3fd8ecc62 /Android.bp | |
| parent | a081325972d521d1cf49bb49f1c1f9f6d7903d83 (diff) | |
| parent | 13c1831ff61fc6dd1fb92eea05fa233437444ec5 (diff) | |
Merge "m framework-minus-apex should not build services" into main am: 13c1831ff6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2799993
Change-Id: I2dbcf61171ff94a7a5fa91bf6b1c285240e9a394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp index 28a738c969bf..1e5120f2b907 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", @@ -523,6 +518,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", |