diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 97 |
1 files changed, 77 insertions, 20 deletions
diff --git a/Android.bp b/Android.bp index 30dad50f9066..d04eb17adf15 100644 --- a/Android.bp +++ b/Android.bp @@ -215,13 +215,14 @@ filegroup { ":framework-core-sources", ":framework-drm-sources", ":framework-graphics-sources", + ":framework-jobscheduler-sources", // jobscheduler is not a module for R ":framework-keystore-sources", ":framework-location-sources", ":framework-lowpan-sources", - ":framework-media-sources", ":framework-mca-effect-sources", ":framework-mca-filterfw-sources", ":framework-mca-filterpacks-sources", + ":framework-media-sources", ":framework-mime-sources", ":framework-mms-sources", ":framework-opengl-sources", @@ -295,6 +296,12 @@ java_defaults { "wifi/java", ], }, + + required: [ + // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly. + "gps_debug.conf", + "protolog.conf.json.gz", + ], } // Collection of classes that are generated from non-Java files that are not listed in @@ -321,6 +328,7 @@ java_library { "android.hardware.thermal-V1.1-java", "android.hardware.thermal-V2.0-java", "android.hardware.tv.input-V1.0-java-constants", + "android.hardware.tv.tuner-V1.0-java-constants", "android.hardware.usb-V1.0-java-constants", "android.hardware.usb-V1.1-java-constants", "android.hardware.usb-V1.2-java-constants", @@ -368,17 +376,15 @@ java_defaults { "mimemap", ], - required: [ - // TODO: remove gps_debug when the build system propagates "required" properly. - "gps_debug.conf", - ], - dxflags: [ "--core-library", "--multi-dex", ], - plugins: ["view-inspector-annotation-processor"], + plugins: [ + "view-inspector-annotation-processor", + "staledataclass-annotation-processor", + ], } filegroup { @@ -424,6 +430,8 @@ java_library { "framework-platform-compat-config", "libcore-platform-compat-config", "services-platform-compat-config", + "media-provider-platform-compat-config", + "services-devicepolicy-platform-compat-config", ], // For backwards compatibility. stem: "framework", @@ -458,7 +466,7 @@ java_library { java_library { name: "framework-annotation-proc", - defaults: ["framework-defaults"], + defaults: ["framework-aidl-export-defaults"], srcs: [":framework-all-sources"], installable: false, plugins: [ @@ -924,16 +932,13 @@ framework_docs_only_libs = [ "android-support-compat", "android-support-core-ui", "android-support-core-utils", - "android-support-customtabs", "android-support-design", "android-support-dynamic-animation", "android-support-exifinterface", "android-support-fragment", "android-support-media-compat", "android-support-percent", - "android-support-recommendation", "android-support-transition", - "android-support-tv-provider", "android-support-v7-cardview", "android-support-v7-gridlayout", "android-support-v7-mediarouter", @@ -942,15 +947,10 @@ framework_docs_only_libs = [ "android-support-v13", "android-support-v14-preference", "android-support-v17-leanback", - "android-support-v17-preference-leanback", - "android-support-wear", "android-support-vectordrawable", "android-support-animatedvectordrawable", "android-support-v7-appcompat", "android-support-v7-recyclerview", - "android-support-emoji", - "android-support-emoji-appcompat", - "android-support-emoji-bundled", "android-support-v8-renderscript", "android-support-multidex", "android-support-multidex-instrumentation", @@ -965,7 +965,8 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x "--hide CallbackInterface " + "--hide MissingPermission --hide BroadcastBehavior " + "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " + - "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " + "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " + + "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*" // http://b/129765390 Rewrite links to "platform" or "technotes" folders // which are siblings (and thus outside of) {@docRoot}. @@ -1018,7 +1019,7 @@ stubs_defaults { "sdk-dir", "api-versions-jars-dir", ], - previous_api: ":last-released-public-api", + previous_api: ":last-released-public-api-for-metalava-annotations", merge_annotations_dirs: [ "metalava-manual", "ojluni-annotated-sdk-stubs", @@ -1075,7 +1076,7 @@ stubs_defaults { local_sourcepaths: frameworks_base_subdirs, installable: false, annotations_enabled: true, - previous_api: ":last-released-public-api", + previous_api: ":last-released-public-api-for-metalava-annotations", merge_annotations_dirs: [ "metalava-manual", "ojluni-annotated-sdk-stubs", @@ -1410,7 +1411,7 @@ droidstubs { installable: false, sdk_version: "core_platform", annotations_enabled: true, - previous_api: ":last-released-public-api", + previous_api: ":last-released-public-api-for-metalava-annotations", merge_annotations_dirs: [ "metalava-manual", "ojluni-annotated-sdk-stubs", @@ -1590,6 +1591,30 @@ genrule { // Avoid including Parcelable classes as we don't want to have two copies of // Parcelable cross the process. filegroup { + name: "framework-telephony-stack-shared-srcs", + srcs: [ + "core/java/android/os/RegistrantList.java", + "core/java/android/os/Registrant.java", + "core/java/android/util/LocalLog.java", + "core/java/android/util/Slog.java", + "core/java/android/util/TimeUtils.java", + "core/java/com/android/internal/os/SomeArgs.java", + "core/java/com/android/internal/util/ArrayUtils.java", + "core/java/com/android/internal/util/DumpUtils.java", + "core/java/com/android/internal/util/FastXmlSerializer.java", + "core/java/com/android/internal/util/HexDump.java", + "core/java/com/android/internal/util/IndentingPrintWriter.java", + "core/java/com/android/internal/util/Preconditions.java", + "core/java/com/android/internal/util/State.java", + "core/java/com/android/internal/util/StateMachine.java", + "core/java/com/android/internal/util/UserIcons.java", + "core/java/com/android/internal/util/XmlUtils.java", + ], +} + +// Avoid including Parcelable classes as we don't want to have two copies of +// Parcelable cross the process. +filegroup { name: "framework-cellbroadcast-shared-srcs", srcs: [ "core/java/android/util/LocalLog.java", @@ -1598,3 +1623,35 @@ filegroup { "core/java/com/android/internal/util/StateMachine.java", ], } + +filegroup { + name: "framework-ims-common-shared-srcs", + srcs: [ + "core/java/android/os/RegistrantList.java", + "core/java/android/os/Registrant.java", + "core/java/com/android/internal/os/SomeArgs.java", + "core/java/com/android/internal/util/Preconditions.java", + ], +} + +filegroup { + name: "framework-wifistack-shared-srcs", + srcs: [ + ":framework-annotations", + "core/java/android/os/HandlerExecutor.java", + "core/java/android/util/KeyValueListParser.java", + "core/java/android/util/LocalLog.java", + "core/java/android/util/Rational.java", + "core/java/android/util/proto/ProtoStream.java", + "core/java/android/util/proto/ProtoOutputStream.java", + "core/java/com/android/internal/util/FastXmlSerializer.java", + "core/java/com/android/internal/util/HexDump.java", + "core/java/com/android/internal/util/IState.java", + "core/java/com/android/internal/util/MessageUtils.java", + "core/java/com/android/internal/util/Preconditions.java", + "core/java/com/android/internal/util/State.java", + "core/java/com/android/internal/util/StateMachine.java", + "core/java/com/android/internal/util/WakeupMessage.java", + "core/java/com/android/internal/util/XmlUtils.java", + ], +} |