diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 92 |
1 files changed, 85 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp index d8848029af3e..aa654865e09b 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", @@ -167,7 +166,6 @@ java_defaults { "identity/java", "keystore/java", "location/java", - "lowpan/java", "media/java", "media/mca/effect/java", "media/mca/filterfw/java", @@ -215,7 +213,7 @@ java_library { "android.hardware.radio.data-V1-java", "android.hardware.radio.messaging-V1-java", "android.hardware.radio.modem-V1-java", - "android.hardware.radio.network-V1-java", + "android.hardware.radio.network-V2-java", "android.hardware.radio.sim-V1-java", "android.hardware.radio.voice-V1-java", "android.hardware.thermal-V1.0-java-constants", @@ -257,7 +255,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", @@ -265,6 +266,59 @@ java_defaults { ], aidl: { generate_get_transaction_name: true, + enforce_permissions: true, + enforce_permissions_exceptions: [ + // Do not add entries to this list. + ":framework-annotations", + ":framework-blobstore-sources", + ":framework-core-sources", + ":framework-drm-sources", + ":framework-graphics-nonupdatable-sources", + ":framework-jobscheduler-sources", + ":framework-keystore-sources", + ":framework-identity-sources", + ":framework-location-sources", + ":framework-mca-effect-sources", + ":framework-mca-filterfw-sources", + ":framework-mca-filterpacks-sources", + ":framework-media-non-updatable-sources", + ":framework-mms-sources", + ":framework-omapi-sources", + ":framework-opengl-sources", + ":framework-rs-sources", + ":framework-sax-sources", + ":framework-telecomm-sources", + ":framework-telephony-common-sources", + ":framework-telephony-sources", + ":framework-vcn-util-sources", + ":framework-wifi-annotations", + ":framework-wifi-non-updatable-sources", + ":PacProcessor-aidl-sources", + ":ProxyHandler-aidl-sources", + ":net-utils-framework-common-srcs", + ":platform-compat-native-aidl", + ":credstore_aidl", + ":dumpstate_aidl", + ":framework_native_aidl", + ":gatekeeper_aidl", + ":gsiservice_aidl", + ":idmap2_aidl", + ":idmap2_core_aidl", + ":incidentcompanion_aidl", + ":inputconstants_aidl", + ":installd_aidl", + ":libaudioclient_aidl", + ":libbinder_aidl", + ":libbluetooth-binder-aidl", + ":libcamera_client_aidl", + ":libcamera_client_framework_aidl", + ":libupdate_engine_aidl", + ":logd_aidl", + ":resourcemanager_aidl", + ":storaged_aidl", + ":vold_aidl", + ":deviceproductinfoconstants_aidl", + ], local_include_dirs: [ "media/aidl", ], @@ -288,6 +342,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. @@ -314,8 +376,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 @@ -353,10 +413,19 @@ java_library { ], lint: { extra_check_modules: ["AndroidFrameworkLintChecker"], + disabled_checks: ["ApiMightLeakAppVisibility"], + error_checks: [ + "ClearIdentityCallNotFollowedByTryFinally", + "NestedClearCallingIdentityCalls", + "NonFinalTokenOfOriginalCallingIdentity", + "RestoreIdentityCallNotInFinallyBlock", + "ResultOfClearIdentityCallNotStoredInVariable", + "UnusedTokenOfOriginalCallingIdentity", + "UseOfCallerAwareMethodsWithClearedIdentity", + ], }, errorprone: { javacflags: [ - "-Xep:AndroidFrameworkBinderIdentity:ERROR", "-Xep:AndroidFrameworkCompatChange:ERROR", "-Xep:AndroidFrameworkUid:ERROR", ], @@ -367,6 +436,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 |