diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 101 |
1 files changed, 87 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp index 35c7b1bc6fdd..594126fcc157 100644 --- a/Android.bp +++ b/Android.bp @@ -112,6 +112,14 @@ filegroup { } filegroup { + name: "framework-mime-sources", + srcs: [ + "mime/java/**/*.java", + ], + path: "mime/java", +} + +filegroup { name: "framework-opengl-sources", srcs: [ "opengl/java/**/*.java", @@ -154,6 +162,14 @@ filegroup { } filegroup { + name: "framework-telephony-common-sources", + srcs: [ + "telephony/common/**/*.java", + ], + path: "telephony/common", +} + +filegroup { name: "framework-wifi-sources", srcs: [ "wifi/java/**/*.java", @@ -163,7 +179,7 @@ filegroup { } filegroup { - name: "framework-srcs", + name: "framework-non-updatable-sources", srcs: [ // Java/AIDL sources under frameworks/base ":framework-core-sources", @@ -176,10 +192,12 @@ filegroup { ":framework-mca-effect-sources", ":framework-mca-filterfw-sources", ":framework-mca-filterpacks-sources", + ":framework-mime-sources", ":framework-opengl-sources", ":framework-rs-sources", ":framework-sax-sources", ":framework-telecomm-sources", + ":framework-telephony-common-sources", ":framework-telephony-sources", ":framework-wifi-sources", ":PacProcessor-aidl-sources", @@ -211,6 +229,14 @@ filegroup { ], } +filegroup { + name: "framework-all-sources", + srcs: [ + ":framework-non-updatable-sources", + ":updatable-media-srcs", + ], +} + java_defaults { name: "framework-aidl-export-defaults", aidl: { @@ -236,8 +262,9 @@ java_defaults { }, required: [ - // TODO: remove gps_debug when the build system propagates "required" properly. + // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly. "gps_debug.conf", + "protolog.conf.json.gz", ], } @@ -288,15 +315,12 @@ java_defaults { defaults: ["framework-aidl-export-defaults"], installable: true, - srcs: [ - ":framework-srcs", - "core/java/**/*.logtags", - ], - aidl: { generate_get_transaction_name: true, }, + srcs: ["core/java/**/*.logtags"], + exclude_srcs: [ // See comment on framework-atb-backward-compatibility module below "core/java/android/content/pm/AndroidTestBaseUpdater.java", @@ -310,7 +334,10 @@ java_defaults { jarjar_rules: ":framework-jarjar-rules", - static_libs: ["framework-internal-utils"], + static_libs: [ + "framework-internal-utils", + "mimemap", + ], dxflags: [ "--core-library", @@ -359,6 +386,7 @@ filegroup { java_library { name: "framework-minus-apex", defaults: ["framework-defaults"], + srcs: [":framework-non-updatable-sources"], javac_shard_size: 150, } @@ -379,8 +407,16 @@ java_library { } java_library { + name: "framework-all", + defaults: ["framework-defaults"], + srcs: [":framework-all-sources"], + installable: false, +} + +java_library { name: "framework-annotation-proc", defaults: ["framework-defaults"], + srcs: [":framework-all-sources"], installable: false, plugins: [ "unsupportedappusage-annotation-processor", @@ -787,6 +823,7 @@ frameworks_base_subdirs = [ "opengl/java", "sax/java", "telecomm/java", + "telephony/common", "telephony/java", "wifi/java", "lowpan/java", @@ -883,10 +920,23 @@ metalava_framework_docs_args += " --replace-documentation " + // replacement (with $1, $2 backreferences to the regex groups) "'$$1https://docs.oracle.com/javase/8/docs/$$2\">' " +packages_to_document = [ + "android", + "dalvik", + "java", + "javax", + "junit", + "org.apache.http", + "org.json", + "org.w3c.dom", + "org.xml.sax", + "org.xmlpull", +] + stubs_defaults { name: "framework-doc-stubs-default", srcs: [ - ":framework-srcs", + ":framework-non-updatable-sources", "core/java/**/*.logtags", "test-base/src/**/*.java", ":opt-telephony-srcs", @@ -906,7 +956,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", @@ -951,7 +1001,7 @@ doc_defaults { stubs_defaults { name: "metalava-api-stubs-default", srcs: [ - ":framework-srcs", + ":framework-non-updatable-sources", "core/java/**/*.logtags", ":opt-telephony-srcs", ":opt-net-voip-srcs", @@ -963,7 +1013,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", @@ -974,6 +1024,7 @@ stubs_defaults { "api-versions-jars-dir", ], sdk_version: "core_platform", + filter_packages: packages_to_document, } droidstubs { @@ -1298,7 +1349,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", @@ -1472,7 +1523,7 @@ filegroup { // annotations to private apis aidl_mapping { name: "framework-aidl-mappings", - srcs: [":framework-srcs"], + srcs: [":framework-all-sources"], output: "framework-aidl-mappings.txt", } @@ -1485,3 +1536,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" + ], +} + |