diff options
| author | 2024-07-19 19:46:19 +0000 | |
|---|---|---|
| committer | 2024-07-19 19:46:19 +0000 | |
| commit | 4c1c8684801c957a8eb2a514b01ae1ab23596873 (patch) | |
| tree | bb80948a7ac504eca9b6cc84cec9f0c1eb96f52a /api/Android.bp | |
| parent | 0a8c338b9acfa85730f00e4a3a657bce123dc70f (diff) | |
| parent | 9891943a1178d628a8c3a037548d0c6171d887a6 (diff) | |
Merge "[CrashRecovery] Conditionally add module lib to Android SDK" into main am: 9891943a11
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3184819
Change-Id: I93721cb915a62c838793c8c71afa00ebd7983943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/Android.bp')
| -rw-r--r-- | api/Android.bp | 46 |
1 files changed, 12 insertions, 34 deletions
diff --git a/api/Android.bp b/api/Android.bp index 89a0c186651a..d931df165a8f 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -62,40 +62,8 @@ metalava_cmd = "$(location metalava)" metalava_cmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED " metalava_cmd += " --quiet " -soong_config_module_type { - name: "enable_crashrecovery_module", - module_type: "combined_apis_defaults", - config_namespace: "ANDROID", - bool_variables: ["release_crashrecovery_module"], - properties: [ - "bootclasspath", - "system_server_classpath", - ], -} - -soong_config_bool_variable { - name: "release_crashrecovery_module", -} - -enable_crashrecovery_module { - name: "crashrecovery_module_defaults", - soong_config_variables: { - release_crashrecovery_module: { - bootclasspath: [ - "framework-crashrecovery", - ], - system_server_classpath: [ - "service-crashrecovery", - ], - }, - }, -} - combined_apis { name: "frameworks-base-api", - defaults: [ - "crashrecovery_module_defaults", - ], bootclasspath: [ "android.net.ipsec.ike", "art.module.public.api", @@ -128,7 +96,12 @@ combined_apis { "framework-virtualization", "framework-wifi", "i18n.module.public.api", - ], + ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { + "true": [ + "framework-crashrecovery", + ], + default: [], + }), system_server_classpath: [ "service-art", "service-configinfrastructure", @@ -137,7 +110,12 @@ combined_apis { "service-permission", "service-rkp", "service-sdksandbox", - ], + ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { + "true": [ + "service-crashrecovery", + ], + default: [], + }), } genrule { |