diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index caec3a21e89f..55d9c4bb2972 100644 --- a/Android.bp +++ b/Android.bp @@ -72,7 +72,6 @@ filegroup { ":framework-keystore-sources", ":framework-identity-sources", ":framework-location-sources", - ":framework-lowpan-sources", ":framework-mca-effect-sources", ":framework-mca-filterfw-sources", ":framework-mca-filterpacks-sources", @@ -170,7 +169,6 @@ java_defaults { "identity/java", "keystore/java", "location/java", - "lowpan/java", "media/java", "media/mca/effect/java", "media/mca/filterfw/java", @@ -260,7 +258,10 @@ filegroup { java_defaults { name: "framework-minus-apex-defaults", - defaults: ["framework-aidl-export-defaults"], + defaults: [ + "framework-aidl-export-defaults", + "latest_android_hardware_soundtrigger3_java_static", + ], srcs: [ ":framework-non-updatable-sources", "core/java/**/*.logtags", @@ -291,6 +292,14 @@ java_defaults { "staledataclass-annotation-processor", "error_prone_android_framework", ], + // Exports needed for staledataclass-annotation-processor, see b/139342589. + javacflags: [ + "-J--add-modules=jdk.compiler", + "-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED", + "-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED", + "-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED", + "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", + ], required: [ // TODO(b/120066492): remove default_television.xml when the build system // propagates "required" properly. @@ -308,6 +317,7 @@ java_defaults { "contacts-provider-platform-compat-config", ], libs: [ + "androidx.annotation_annotation", "app-compat-annotations", "ext", "framework-updatable-stubs-module_libs_api", @@ -316,8 +326,6 @@ java_defaults { sdk_version: "core_platform", static_libs: [ "android.hardware.common.fmq-V1-java", - // TODO(b/184162091) - "android.hardware.soundtrigger3-V1-java", "bouncycastle-repackaged-unbundled", "framework-internal-utils", // If MimeMap ever becomes its own APEX, then this dependency would need to be removed @@ -328,6 +336,7 @@ java_defaults { "soundtrigger_middleware-aidl-java", "modules-utils-build", "modules-utils-preconditions", + "modules-utils-statemachine", "modules-utils-synchronous-result-receiver", "modules-utils-os", "modules-utils-uieventlogger-interface", @@ -368,6 +377,15 @@ java_library { name: "framework-minus-apex-intdefs", defaults: ["framework-minus-apex-defaults"], plugins: ["intdef-annotation-processor"], + + // Errorprone and android lint will already run on framework-minus-apex, don't rerun them on + // the intdefs version in order to speed up the build. + errorprone: { + enabled: false, + }, + lint: { + enabled: false, + }, } // This "framework" module is NOT installed to the device. It's |