diff options
| author | Xin Li <delphij@google.com> | 2024-01-30 10:36:03 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-01-30 10:36:03 -0800 |
| commit | 7b647e4ea0e92f33c19b315eaed364ee067ba0aa (patch) | |
| tree | 47c285aa18cf79476d615f8e169ebd823bee6d38 /api/Android.bp | |
| parent | 46deec9f696f850efdd4427e10db145d68cbb5bd (diff) | |
| parent | efd99108901ae47b085f96c841214f6f416dd86f (diff) | |
| download | base-7b647e4ea0e92f33c19b315eaed364ee067ba0aa.tar.gz | |
Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I46c7859ff042ee7aa9193757e5df8269f4892362
Change-Id: I0c7b5036c0b0f5f2caad551edb063350f6eb87e7
Diffstat (limited to 'api/Android.bp')
| -rw-r--r-- | api/Android.bp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/api/Android.bp b/api/Android.bp index 7fb427eb715a..b3b18b66e097 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -60,15 +60,6 @@ metalava_cmd = "$(location metalava)" metalava_cmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED " metalava_cmd += " --quiet " -genrule { - name: "current-api-xml", - tools: ["metalava"], - srcs: [":frameworks-base-api-current.txt"], - out: ["current.api"], - cmd: metalava_cmd + "signature-to-jdiff $(in) $(out)", - visibility: ["//visibility:public"], -} - soong_config_module_type { name: "enable_crashrecovery_module", module_type: "combined_apis_defaults", @@ -339,8 +330,6 @@ stubs_defaults { libs: [ "android.hardware.cas-V1.2-java", "android.hardware.health-V1.0-java-constants", - "android.hardware.radio-V1.5-java", - "android.hardware.radio-V1.6-java", "android.hardware.thermal-V1.0-java-constants", "android.hardware.thermal-V2.0-java", "android.hardware.tv.input-V1.0-java-constants", @@ -355,14 +344,11 @@ stubs_defaults { "--error UnhiddenSystemApi", "--error UnflaggedApi", "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*", - "--hide BroadcastBehavior", + // Disable CallbackInterface, as Java 8 default interface methods avoid the extensibility + // issue interfaces had previously. "--hide CallbackInterface", - "--hide DeprecationMismatch", + // Disable HiddenSuperclass, as Metalava handles this fine (it should be hidden by default) "--hide HiddenSuperclass", - "--hide MissingPermission", - "--hide RequiresPermission", - "--hide SdkConstant", - "--hide Todo", "--hide-package android.audio.policy.configuration.V7_0", "--hide-package com.android.server", "--manifest $(location :frameworks-base-core-AndroidManifest.xml)", |