diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-06 19:15:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2024-03-06 19:15:23 +0000 |
| commit | deefb2be162d551ec1b8c9cab1abd4b721dfec65 (patch) | |
| tree | b85fd84ccab49c3ccb4f0967174fef30f2656062 /api/Android.bp | |
| parent | 23a119fc57a1a8ffbb48358d0c6e592861a2802b (diff) | |
| parent | e97d112585cbd43f223c13a47acc992f11dbb87a (diff) | |
| download | base-deefb2be162d551ec1b8c9cab1abd4b721dfec65.tar.gz | |
Merge "Split android_non_updatable_stubs_libs" into aosp-main-future
Diffstat (limited to 'api/Android.bp')
| -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 62520fa18773..76cdf21411d2 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -297,6 +297,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. @@ -328,18 +350,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", |