diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 61 |
1 files changed, 45 insertions, 16 deletions
diff --git a/Android.bp b/Android.bp index 7241417e6f5d..bef32513d18b 100644 --- a/Android.bp +++ b/Android.bp @@ -242,6 +242,11 @@ java_defaults { "wifi/java", ], }, + + required: [ + // TODO: remove gps_debug when the build system propagates "required" properly. + "gps_debug.conf", + ], } // Collection of classes that are generated from non-Java files that are not listed in @@ -312,17 +317,15 @@ java_defaults { static_libs: ["framework-internal-utils"], - 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 { @@ -359,15 +362,26 @@ filegroup { } java_library { - name: "framework", + name: "framework-minus-apex", defaults: ["framework-defaults"], srcs: [":framework-non-updatable-sources"], javac_shard_size: 150, +} + +java_library { + name: "framework", + defaults: ["framework-aidl-export-defaults"], + installable: true, + static_libs: [ + "framework-minus-apex", + "jobscheduler-framework", + ], required: [ "framework-platform-compat-config", "libcore-platform-compat-config", "services-platform-compat-config", ], + sdk_version: "core_platform", } java_library { @@ -502,7 +516,6 @@ java_library { sdk_version: "core_platform", static_libs: [ "libphonenumber-platform", - "nist-sip", "tagsoup", "rappor", "libtextclassifier-java", @@ -836,16 +849,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", @@ -854,15 +864,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", @@ -915,6 +920,7 @@ stubs_defaults { ":updatable-media-srcs", "test-mock/src/**/*.java", "test-runner/src/**/*.java", + ":jobscheduler-framework-source", ], libs: framework_docs_only_libs, local_sourcepaths: frameworks_base_subdirs, @@ -976,6 +982,7 @@ stubs_defaults { ":opt-net-voip-srcs", ":core_public_api_files", ":updatable-media-srcs", + ":jobscheduler-framework-source", ], libs: ["framework-internal-utils"], local_sourcepaths: frameworks_base_subdirs, @@ -1504,3 +1511,25 @@ genrule { targets: ["droidcore"], }, } + +// 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/Preconditions.java", + "core/java/com/android/internal/util/State.java", + "core/java/com/android/internal/util/StateMachine.java", + "core/java/com/android/internal/util/XmlUtils.java", + "core/java/com/android/internal/util/HexDump.java", + "core/java/com/android/internal/util/IndentingPrintWriter.java", + "core/java/com/android/internal/util/DumpUtils.java" + ], +} + |