diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 162 |
1 files changed, 90 insertions, 72 deletions
diff --git a/Android.bp b/Android.bp index 9411eeca834c..df852bda4904 100644 --- a/Android.bp +++ b/Android.bp @@ -191,12 +191,20 @@ filegroup { path: "telephony/java", } +genrule { + name: "statslog-telephony-common-java-gen", + tools: ["stats-log-api-gen"], + cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common" + + " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog", + out: ["com/android/internal/telephony/TelephonyCommonStatsLog.java"], +} + filegroup { name: "framework-telephony-common-sources", srcs: [ "telephony/common/**/*.java", + ":statslog-telephony-common-java-gen", ], - path: "telephony/common", } filegroup { @@ -255,8 +263,6 @@ filegroup { ":libcamera_client_aidl", ":libcamera_client_framework_aidl", ":libupdate_engine_aidl", - // TODO: this needs to be removed when statsd-framework.jar is separated out - ":statsd_java_aidl", ":storaged_aidl", ":vold_aidl", @@ -265,7 +271,8 @@ filegroup { // etc. ":framework-javastream-protos", - ":framework-statslog-gen", + ":framework-statslog-gen", // StatsLogInternal.java + ":statslog-framework-java-gen", // FrameworkStatsLog.java // telephony annotations ":framework-telephony-annotations", @@ -392,9 +399,8 @@ java_defaults { "app-compat-annotations", "ext", "unsupportedappusage", - "updatable_media_stubs", - "framework_mediaprovider_stubs", - "framework-tethering", + "framework-media-stubs-systemapi", + "framework-mediaprovider-stubs-systemapi", "framework-telephony-stubs", ], @@ -437,13 +443,6 @@ filegroup { } filegroup { - name: "graphicsstats_proto", - srcs: [ - "libs/hwui/protos/graphicsstats.proto", - ], -} - -filegroup { name: "libvibrator_aidl", srcs: [ "core/java/android/os/IExternalVibrationController.aidl", @@ -459,10 +458,11 @@ java_library { libs: [ "framework-appsearch-stubs", "framework-sdkextensions-stubs-systemapi", - "framework-statsd", // TODO(b/146167933): Use framework-statsd-stubs - "framework-permission-stubs", + "framework-statsd-stubs-module_libs_api", + "framework-permission-stubs-systemapi", "framework-wifi-stubs", "ike-stubs", + "framework-tethering-stubs", ], installable: true, javac_shard_size: 150, @@ -482,14 +482,12 @@ java_library { apex_available: ["//apex_available:platform"], visibility: [ "//frameworks/base", - // TODO(b/144149403) remove the below lines + // TODO(b/147128803) remove the below lines "//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/telephony", - "//frameworks/opt/net/wifi/service", + "//frameworks/base/packages/Tethering/tests/unit", ], } @@ -508,17 +506,15 @@ java_library { installable: false, // this lib is a build-only library static_libs: [ "framework-minus-apex", - "updatable_media_stubs", - "framework_mediaprovider_stubs", "framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs - "framework-permission-stubs", + "framework-media-stubs-systemapi", + "framework-mediaprovider-stubs-systemapi", + "framework-permission-stubs-systemapi", "framework-sdkextensions-stubs-systemapi", - // TODO(b/146167933): Use framework-statsd-stubs instead. - "framework-statsd", + "framework-statsd-stubs-module_libs_api", "framework-wifi-stubs", "ike-stubs", - // TODO(b/147200698): should be the stub of framework-tethering - "framework-tethering", + "framework-tethering-stubs", // TODO (b/147688669) should be framework-telephony-stubs "framework-telephony", // TODO(jiyong): add stubs for APEXes here @@ -533,7 +529,7 @@ java_library { srcs: [":framework-all-sources"], installable: false, static_libs: [ - "exoplayer2-core", + "exoplayer2-extractor", "android.hardware.wifi-V1.0-java-constants", ], libs: ["icing-java-proto-lite"], @@ -542,18 +538,26 @@ java_library { java_library { name: "framework-annotation-proc", - srcs: [":framework-all-sources"], + srcs: [ + ":framework-all-sources", + "core/java/**/*.logtags", + ], + sdk_version: "core_platform", libs: [ "app-compat-annotations", + "ext", + "icing-java-proto-lite", "unsupportedappusage", ], + installable: false, plugins: [ "unsupportedappusage-annotation-processor", "compat-changeid-annotation-processor", ], static_libs: [ - "exoplayer2-core", + "framework-internal-utils", + "exoplayer2-extractor", "android.hardware.wifi-V1.0-java-constants", ] } @@ -574,7 +578,6 @@ java_library { host_supported: true, srcs: [ "core/java/android/annotation/IntDef.java", - "core/java/android/annotation/UnsupportedAppUsage.java", ], static_libs: [ "art.module.api.annotations", @@ -604,6 +607,26 @@ genrule { out: ["android/util/StatsLogInternal.java"], } +genrule { + name: "statslog-framework-java-gen", + tools: ["stats-log-api-gen"], + cmd: "$(location stats-log-api-gen) --java $(out) --module framework" + + " --javaPackage com.android.internal.util --javaClass FrameworkStatsLog --worksource", + out: ["com/android/internal/util/FrameworkStatsLog.java"], +} + +java_library { + name: "uieventloggerlib", + srcs: [ + "core/java/com/android/internal/logging/UiEvent.java", + "core/java/com/android/internal/logging/UiEventLogger.java", + "core/java/com/android/internal/logging/UiEventLoggerImpl.java", + "core/java/com/android/internal/logging/InstanceId.java", + "core/java/com/android/internal/logging/InstanceIdSequence.java", + ":statslog-framework-java-gen", + ], +} + gensrcs { name: "framework-javastream-protos", depfile: true, @@ -632,6 +655,33 @@ gensrcs { output_extension: "srcjar", } +gensrcs { + name: "framework-cppstream-protos", + depfile: true, + + tools: [ + "aprotoc", + "protoc-gen-cppstream", + ], + + cmd: "mkdir -p $(genDir) " + + "&& $(location aprotoc) " + + " --plugin=$(location protoc-gen-cppstream) " + + " --dependency_out=$(depfile) " + + " --cppstream_out=$(genDir) " + + " -Iexternal/protobuf/src " + + " -I . " + + " $(in)", + + srcs: [ + ":ipconnectivity-proto-src", + "core/proto/**/*.proto", + "libs/incident/**/*.proto", + ], + + output_extension: "proto.h", +} + filegroup { name: "framework-annotations", srcs: [ @@ -647,7 +697,6 @@ filegroup { "core/java/android/annotation/SystemApi.java", "core/java/android/annotation/SystemService.java", "core/java/android/annotation/TestApi.java", - "core/java/android/annotation/UnsupportedAppUsage.java", "core/java/com/android/internal/annotations/GuardedBy.java", "core/java/com/android/internal/annotations/VisibleForTesting.java", "core/java/com/android/internal/annotations/Immutable.java", @@ -719,6 +768,7 @@ filegroup { "core/java/android/annotation/RequiresPermission.java", "core/java/android/annotation/SystemApi.java", "core/java/android/annotation/TestApi.java", + "core/java/com/android/internal/annotations/GuardedBy.java", ], } // Build ext.jar @@ -921,7 +971,9 @@ filegroup { name: "incremental_manager_aidl", srcs: [ "core/java/android/os/incremental/IIncrementalManager.aidl", - "core/java/android/os/incremental/IIncrementalManagerNative.aidl", + "core/java/android/os/incremental/IIncrementalService.aidl", + "core/java/android/os/incremental/IncrementalNewFileParams.aidl", + "core/java/android/os/incremental/IncrementalSignature.aidl", ], path: "core/java", } @@ -987,43 +1039,6 @@ aidl_interface { }, } -gensrcs { - name: "gen-platform-proto-constants", - depfile: true, - - tools: [ - "aprotoc", - "protoc-gen-cppstream", - ], - - srcs: [ - "core/proto/android/os/backtrace.proto", - "core/proto/android/os/batterytype.proto", - "core/proto/android/os/cpufreq.proto", - "core/proto/android/os/cpuinfo.proto", - "core/proto/android/os/data.proto", - "core/proto/android/os/kernelwake.proto", - "core/proto/android/os/pagetypeinfo.proto", - "core/proto/android/os/procrank.proto", - "core/proto/android/os/ps.proto", - "core/proto/android/os/system_properties.proto", - "core/proto/android/util/event_log_tags.proto", - "core/proto/android/util/log.proto", - ], - - // Append protoc-gen-cppstream tool's PATH otherwise aprotoc can't find the plugin tool - cmd: "mkdir -p $(genDir) " + - "&& $(location aprotoc) " + - " --plugin=$(location protoc-gen-cppstream) " + - " --dependency_out=$(depfile) " + - " --cppstream_out=$(genDir) " + - " -Iexternal/protobuf/src " + - " -I . " + - " $(in)", - - output_extension: "proto.h", -} - subdirs = [ "cmds/*", @@ -1054,7 +1069,6 @@ java_library { "core/java/android/annotation/Nullable.java", "core/java/android/annotation/SystemApi.java", "core/java/android/annotation/TestApi.java", - "core/java/android/annotation/UnsupportedAppUsage.java", "core/java/android/os/HidlMemory.java", "core/java/android/os/HwBinder.java", "core/java/android/os/HwBlob.java", @@ -1267,7 +1281,11 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x "--hide MissingPermission --hide BroadcastBehavior " + "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " + "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " + - "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*" + "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.* " + + "--api-lint-ignore-prefix android.icu. " + + "--api-lint-ignore-prefix java. " + + "--api-lint-ignore-prefix junit. " + + "--api-lint-ignore-prefix org. " build = [ "StubLibraries.bp", |