diff options
| author | 2024-03-06 16:50:07 +0000 | |
|---|---|---|
| committer | 2024-03-06 16:50:07 +0000 | |
| commit | 09d30a2bffa7253dd162fc19d3129e23939a19a1 (patch) | |
| tree | 41ff6dcb7dcc1f00689c2cf19bd558b0d64b30cc | |
| parent | 468afff523bbebbd6c015a015c9aab189ec87ace (diff) | |
| parent | 5b9160e96750579fe7a53553401dc9993a88f01a (diff) | |
Merge "Split android_non_updatable_stubs_libs" into main
| -rw-r--r-- | api/Android.bp | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/api/Android.bp b/api/Android.bp index 8e063667826c..093ee4beab50 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -298,6 +298,28 @@ packages_to_document = [ "org.xmlpull", ] +// These are libs from framework-internal-utils that are required (i.e. being referenced) +// from framework-non-updatable-sources. Add more here when there's a need. +// DO NOT add the entire framework-internal-utils. It might cause unnecessary circular +// dependencies gets bigger. +android_non_updatable_stubs_libs = [ + "android.hardware.cas-V1.2-java", + "android.hardware.health-V1.0-java-constants", + "android.hardware.thermal-V1.0-java-constants", + "android.hardware.thermal-V2.0-java", + "android.hardware.tv.input-V1.0-java-constants", + "android.hardware.usb-V1.0-java-constants", + "android.hardware.usb-V1.1-java-constants", + "android.hardware.usb.gadget-V1.0-java", + "android.hardware.vibrator-V1.3-java", + "framework-protos", +] + +java_defaults { + name: "android-non-updatable-stubs-libs-defaults", + libs: android_non_updatable_stubs_libs, +} + // Defaults for all stubs that include the non-updatable framework. These defaults do not include // module symbols, so will not compile correctly on their own. Users must add module APIs to the // classpath (or sources) somehow. @@ -329,18 +351,7 @@ stubs_defaults { // from framework-non-updatable-sources. Add more here when there's a need. // DO NOT add the entire framework-internal-utils. It might cause unnecessary circular // dependencies gets bigger. - libs: [ - "android.hardware.cas-V1.2-java", - "android.hardware.health-V1.0-java-constants", - "android.hardware.thermal-V1.0-java-constants", - "android.hardware.thermal-V2.0-java", - "android.hardware.tv.input-V1.0-java-constants", - "android.hardware.usb-V1.0-java-constants", - "android.hardware.usb-V1.1-java-constants", - "android.hardware.usb.gadget-V1.0-java", - "android.hardware.vibrator-V1.3-java", - "framework-protos", - ], + libs: android_non_updatable_stubs_libs, flags: [ "--error NoSettingsProvider", "--error UnhiddenSystemApi", |