diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 52 |
1 files changed, 47 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index 4c07fcf2c17f..b9b1bd87e80d 100644 --- a/Android.bp +++ b/Android.bp @@ -318,6 +318,7 @@ java_defaults { "core/java/android/service/vr/IVrListener.aidl", "core/java/android/service/vr/IVrManager.aidl", "core/java/android/service/vr/IVrStateCallbacks.aidl", + "core/java/android/service/watchdog/IExplicitHealthCheckService.aidl", "core/java/android/print/ILayoutResultCallback.aidl", "core/java/android/print/IPrinterDiscoveryObserver.aidl", "core/java/android/print/IPrintDocumentAdapter.aidl", @@ -475,7 +476,10 @@ java_defaults { "media/java/android/media/IMediaHTTPConnection.aidl", "media/java/android/media/IMediaHTTPService.aidl", "media/java/android/media/IMediaResourceMonitor.aidl", + "media/java/android/media/IMediaRoute2Callback.aidl", + "media/java/android/media/IMediaRoute2Provider.aidl", "media/java/android/media/IMediaRouterClient.aidl", + "media/java/android/media/IMediaRouter2ManagerClient.aidl", "media/java/android/media/IMediaRouterService.aidl", "media/java/android/media/IMediaScannerListener.aidl", "media/java/android/media/IMediaScannerService.aidl", @@ -717,6 +721,7 @@ java_defaults { "frameworks/av/camera/aidl", "frameworks/av/media/libaudioclient/aidl", "frameworks/native/aidl/gui", + "frameworks/native/libs/incidentcompanion/binder", "system/core/storaged/binder", "system/vold/binder", "system/gsid/aidl", @@ -964,7 +969,10 @@ java_library { output_params: ["store_unknown_fields=true"], include_dirs: ["external/protobuf/src"], }, - + exclude_srcs: [ + "core/proto/android/privacy.proto", + "core/proto/android/section.proto", + ], sdk_version: "current", srcs: [ "core/proto/**/*.proto", @@ -984,6 +992,10 @@ java_library { "core/proto/**/*.proto", "libs/incident/proto/android/os/**/*.proto", ], + exclude_srcs: [ + "core/proto/android/privacy.proto", + "core/proto/android/section.proto", + ], // Protos have lots of MissingOverride and similar. errorprone: { javacflags: ["-XepDisableAllChecks"], @@ -991,9 +1003,9 @@ java_library { } // ==== c++ proto device library ============================== -cc_library { - name: "libplatformprotos", - host_supported: true, +cc_defaults { + name: "libplatformprotos-defaults", + proto: { export_proto_headers: true, include_dirs: ["external/protobuf/src"], @@ -1007,8 +1019,13 @@ cc_library { srcs: [ "core/proto/**/*.proto", - "libs/incident/**/*.proto", ], +} + +cc_library { + name: "libplatformprotos", + defaults: ["libplatformprotos-defaults"], + host_supported: true, target: { host: { @@ -1020,6 +1037,9 @@ cc_library { proto: { type: "lite", }, + shared_libs: [ + "libprotobuf-cpp-lite", + ], shared: { enabled: false, }, @@ -1027,6 +1047,26 @@ cc_library { }, } +// This is the full proto version of libplatformprotos. It may only +// be used by test code that is not shipped on the device. +cc_library { + name: "libplatformprotos-test", + defaults: ["libplatformprotos-defaults"], + host_supported: false, + + target: { + android: { + proto: { + type: "full", + }, + shared: { + enabled: false, + }, + }, + }, +} + + gensrcs { name: "gen-platform-proto-constants", depfile: true, @@ -1064,6 +1104,7 @@ gensrcs { output_extension: "proto.h", } + subdirs = [ "cmds/*", "core/*", @@ -1626,6 +1667,7 @@ droidstubs { ":openjdk_java_files", ":non_openjdk_java_files", ":opt-telephony-common-srcs", + "core/java/**/*.java", ], arg_files: [ "core/res/AndroidManifest.xml", |