diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 166 |
1 files changed, 149 insertions, 17 deletions
diff --git a/Android.bp b/Android.bp index f6e010418e09..3ecb5a9340d2 100644 --- a/Android.bp +++ b/Android.bp @@ -53,6 +53,7 @@ filegroup { "core/java/android/view/DisplayAdjustments.java", ], path: "core/java", + visibility: ["//frameworks/base/test-mock"], } filegroup { @@ -73,6 +74,14 @@ filegroup { } filegroup { + name: "framework-identity-sources", + srcs: [ + "identity/java/**/*.java", + ], + path: "identity/java", +} + +filegroup { name: "framework-keystore-sources", srcs: [ "keystore/java/**/*.java", @@ -209,6 +218,7 @@ filegroup { ":framework-graphics-sources", ":framework-jobscheduler-sources", // jobscheduler is not a module for R ":framework-keystore-sources", + ":framework-identity-sources", ":framework-location-sources", ":framework-lowpan-sources", ":framework-mca-effect-sources", @@ -221,7 +231,6 @@ filegroup { ":framework-sax-sources", ":framework-telecomm-sources", ":framework-telephony-common-sources", - ":framework-telephony-sources", ":framework-wifi-annotations", ":framework-wifi-non-updatable-sources", ":PacProcessor-aidl-sources", @@ -232,6 +241,7 @@ filegroup { ":platform-compat-native-aidl", // AIDL sources from external directories + ":credstore_aidl", ":dumpstate_aidl", ":framework_native_aidl", ":gatekeeper_aidl", @@ -256,6 +266,9 @@ filegroup { // etc. ":framework-javastream-protos", ":framework-statslog-gen", + + // telephony annotations + ":framework-telephony-annotations", ], } @@ -268,7 +281,9 @@ filegroup { ":framework-tethering-srcs", ":updatable-media-srcs", ":framework-mediaprovider-sources", + ":framework-permission-sources", ":framework-wifi-updatable-sources", + ":framework-telephony-sources", ":ike-srcs", ] } @@ -282,6 +297,8 @@ filegroup { ], } +// AIDL files under these paths are mixture of public and private ones. +// They shouldn't be exported across module boundaries. java_defaults { name: "framework-aidl-export-defaults", aidl: { @@ -290,6 +307,7 @@ java_defaults { "core/java", "drm/java", "graphics/java", + "identity/java", "keystore/java", "location/java", "lowpan/java", @@ -302,16 +320,9 @@ java_defaults { "rs/java", "sax/java", "telecomm/java", - "telephony/java", - "wifi/java", + "wifi/aidl-export", ], }, - - 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 @@ -324,8 +335,9 @@ java_library { "framework-protos", "game-driver-protos", "android.hidl.base-V1.0-java", - "android.hardware.cas-V1.1-java", "android.hardware.cas-V1.0-java", + "android.hardware.cas-V1.1-java", + "android.hardware.cas-V1.2-java", "android.hardware.contexthub-V1.0-java", "android.hardware.gnss-V1.0-java", "android.hardware.health-V1.0-java-constants", @@ -382,6 +394,7 @@ java_defaults { "updatable_media_stubs", "framework_mediaprovider_stubs", "framework-tethering", + "framework-telephony-stubs", ], jarjar_rules: ":framework-jarjar-rules", @@ -399,6 +412,12 @@ java_defaults { "view-inspector-annotation-processor", "staledataclass-annotation-processor", ], + + required: [ + // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly. + "gps_debug.conf", + "protolog.conf.json.gz", + ], } filegroup { @@ -438,8 +457,9 @@ java_library { srcs: [":framework-non-updatable-sources"], libs: [ "framework-appsearch-stubs", - // TODO(b/146167933): Use framework-statsd-stubs - "framework-statsd", + "framework-sdkextensions-stubs-systemapi", + "framework-statsd", // TODO(b/146167933): Use framework-statsd-stubs + "framework-permission-stubs", "framework-wifi-stubs", "ike-stubs", ], @@ -465,8 +485,9 @@ java_library { "//frameworks/base/apex/appsearch/framework", "//frameworks/base/apex/blobstore/framework", "//frameworks/base/apex/jobscheduler/framework", + "//frameworks/base/apex/permission/framework", "//frameworks/base/apex/statsd/service", - "//frameworks/base/wifi", + "//frameworks/base/telephony", "//frameworks/opt/net/wifi/service", ], } @@ -489,6 +510,7 @@ java_library { "updatable_media_stubs", "framework_mediaprovider_stubs", "framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs + "framework-permission-stubs", "framework-sdkextensions-stubs-systemapi", // TODO(b/146167933): Use framework-statsd-stubs instead. "framework-statsd", @@ -496,6 +518,9 @@ java_library { "ike-stubs", // TODO(b/147200698): should be the stub of framework-tethering "framework-tethering", + // TODO (b/147688669) should be framework-telephony-stubs + "framework-telephony", + // TODO(jiyong): add stubs for APEXes here ], sdk_version: "core_platform", apex_available: ["//apex_available:platform"], @@ -516,7 +541,6 @@ java_library { java_library { name: "framework-annotation-proc", - defaults: ["framework-aidl-export-defaults"], srcs: [":framework-all-sources"], libs: [ "app-compat-annotations", @@ -575,7 +599,7 @@ java_library { genrule { name: "framework-statslog-gen", tools: ["stats-log-api-gen"], - cmd: "$(location stats-log-api-gen) --java $(out)", + cmd: "$(location stats-log-api-gen) --java $(out) --worksource", out: ["android/util/StatsLogInternal.java"], } @@ -600,6 +624,7 @@ gensrcs { "&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)", srcs: [ + ":ipconnectivity-proto-src", "core/proto/**/*.proto", "libs/incident/**/*.proto", ], @@ -689,7 +714,10 @@ filegroup { name: "framework-tethering-annotations", srcs: [ "core/java/android/annotation/NonNull.java", + "core/java/android/annotation/Nullable.java", + "core/java/android/annotation/RequiresPermission.java", "core/java/android/annotation/SystemApi.java", + "core/java/android/annotation/TestApi.java", ], } // Build ext.jar @@ -714,6 +742,7 @@ java_library { java_library_host { name: "platformprotos", srcs: [ + ":ipconnectivity-proto-src", "cmds/am/proto/instrumentation_data.proto", "cmds/statsd/src/**/*.proto", "core/proto/**/*.proto", @@ -742,6 +771,7 @@ java_library { ], sdk_version: "9", srcs: [ + ":ipconnectivity-proto-src", "core/proto/**/*.proto", "libs/incident/proto/android/os/**/*.proto", ], @@ -756,6 +786,7 @@ java_library { }, srcs: [ + ":ipconnectivity-proto-src", "core/proto/**/*.proto", "libs/incident/proto/android/os/**/*.proto", ], @@ -786,6 +817,7 @@ cc_defaults { ], srcs: [ + ":ipconnectivity-proto-src", "core/proto/**/*.proto", ], } @@ -1115,9 +1147,10 @@ genrule { } // Avoid including Parcelable classes as we don't want to have two copies of -// Parcelable cross the process. +// Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony) +// and TeleService app (packages/services/Telephony). filegroup { - name: "framework-telephony-stack-shared-srcs", + name: "framework-telephony-common-shared-srcs", srcs: [ "core/java/android/os/BasicShellCommandHandler.java", "core/java/android/os/RegistrantList.java", @@ -1140,6 +1173,21 @@ filegroup { } // Avoid including Parcelable classes as we don't want to have two copies of +// Parcelable cross the process. This is used by framework-telephony (frameworks/base/telephony). +filegroup { + name: "framework-telephony-shared-srcs", + srcs: [ + "core/java/android/util/RecurrenceRule.java", + "core/java/com/android/internal/os/SomeArgs.java", + "core/java/com/android/internal/util/BitwiseInputStream.java", + "core/java/com/android/internal/util/BitwiseOutputStream.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", + ], +} + +// Avoid including Parcelable classes as we don't want to have two copies of // Parcelable cross the process. filegroup { name: "framework-cellbroadcast-shared-srcs", @@ -1178,6 +1226,7 @@ java_library { "core/java/com/android/internal/util/Protocol.java", "core/java/com/android/internal/util/Preconditions.java", "telephony/java/android/telephony/Annotation.java", + ":net-utils-framework-wifi-common-srcs", ], libs: [ "framework-annotations-lib", @@ -1204,6 +1253,7 @@ filegroup { "core/java/com/android/internal/util/StateMachine.java", "core/java/com/android/internal/util/WakeupMessage.java", ], + visibility: ["//frameworks/opt/net/wifi/service"], } // TODO(b/145644363): move this to under StubLibraries.bp or ApiDocs.bp @@ -1222,3 +1272,85 @@ build = [ "StubLibraries.bp", "ApiDocs.bp", ] + +// TODO(b/147699819): move to frameworks/base/telephony/ folder +droidstubs { + name: "framework-telephony-stubs-srcs", + srcs: [ + ":framework-telephony-sources", + ":framework_native_aidl", + ":framework-javastream-protos", + ], + aidl: { + local_include_dirs: [ + "core/java", + "telecomm/java" + ], + }, + libs: [ + "framework-annotations-lib", + "android.hardware.radio-V1.5-java", + ], + defaults: ["framework-module-stubs-defaults-systemapi"], + filter_packages: ["android.telephony"], + sdk_version: "system_current", +} + +java_library { + name: "framework-telephony-stubs", + srcs: [":framework-telephony-stubs-srcs"], + // TODO(b/147699819): move public aidls to a separate folder and potentially remove + // below aidl exports. + aidl: { + export_include_dirs: ["telephony/java"], + }, + sdk_version: "core_current", + libs: ["android_system_stubs_current"], +} + +java_library { + name: "framework-telephony", + srcs: [ + ":framework-telephony-sources", + ":framework-telephony-shared-srcs", + ], + // TODO: change to framework-system-stub to build against system APIs. + libs: [ + "framework-minus-apex", + "unsupportedappusage", + "ike-stubs", + ], + static_libs: [ + "libphonenumber-platform", + "app-compat-annotations", + ], + sdk_version: "core_platform", + aidl: { + export_include_dirs: ["telephony/java"], + include_dirs: [ + "frameworks/native/aidl/binder", + "frameworks/native/aidl/gui", + ] + }, + jarjar_rules: ":framework-telephony-jarjar-rules", + dxflags: [ + "--core-library", + "--multi-dex", + ], + // This is to break the dependency from boot jars. + dex_preopt: { + enabled: false, + }, + installable: true, +} + +filegroup { + // TODO (b/147690217): move to frameworks/base/telephony/common. + name: "framework-telephony-annotations", + srcs: ["telephony/java/android/telephony/Annotation.java"], +} + +filegroup { + name: "framework-telephony-jarjar-rules", + srcs: ["telephony/framework-telephony-jarjar-rules.txt"], +} |