diff options
| author | Jihoon Kang <jihoonkang@google.com> | 2024-03-06 17:35:57 +0000 |
|---|---|---|
| committer | Jihoon Kang <jihoonkang@google.com> | 2024-03-06 17:35:57 +0000 |
| commit | e97d112585cbd43f223c13a47acc992f11dbb87a (patch) | |
| tree | 2c04bfd61db47be52b9b20649737944a60a87581 /api | |
| parent | 61fc070c2523986f94b88d24c136ad83b0748fd2 (diff) | |
| download | base-e97d112585cbd43f223c13a47acc992f11dbb87a.tar.gz | |
Split android_non_updatable_stubs_libs
This change moves the entries android-non-updatable-stubs-defaults.libs
out of the module to an independent list, so that it can be utilized in
both stubs_default module and a java_default module. Utilization of the
java_default module will be done in a child change.
Test: m nothing
Bug: 327507877
Merged-In: Ia8aec25c6c6a199f36a69062754f5b02b15fdb59
Change-Id: I7ed37e1e1b3faa1f49bfb840833a5b7c207540cf
Diffstat (limited to 'api')
| -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 bf9ea48051bc..1e13e954a6d0 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -296,6 +296,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. @@ -327,18 +349,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", |