diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp index 8164d6a477e4..598f4fcaf620 100644 --- a/Android.bp +++ b/Android.bp @@ -604,8 +604,9 @@ java_defaults { ], required: [ "framework-platform-compat-config", - // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly. + // TODO: remove gps_debug, cec_config.xml and protolog.conf.json when the build system propagates "required" properly. "gps_debug.conf", + "cec_config.xml", "icu4j-platform-compat-config", "libcore-platform-compat-config", "protolog.conf.json.gz", @@ -747,6 +748,7 @@ gensrcs { srcs: [ ":ipconnectivity-proto-src", + ":libstats_atom_enum_protos", "core/proto/**/*.proto", "libs/incident/**/*.proto", ], @@ -773,6 +775,7 @@ gensrcs { srcs: [ ":ipconnectivity-proto-src", + ":libstats_atom_enum_protos", "core/proto/**/*.proto", "libs/incident/**/*.proto", ], @@ -912,13 +915,19 @@ java_library_host { name: "platformprotos", srcs: [ ":ipconnectivity-proto-src", + ":libstats_atom_enum_protos", + ":libstats_internal_protos", + ":statsd_internal_protos", "cmds/am/proto/instrumentation_data.proto", "cmds/statsd/src/**/*.proto", "core/proto/**/*.proto", "libs/incident/proto/**/*.proto", ], proto: { - include_dirs: ["external/protobuf/src"], + include_dirs: [ + "external/protobuf/src", + "frameworks/proto_logging/stats", + ], type: "full", }, // Protos have lots of MissingOverride and similar. @@ -943,6 +952,7 @@ java_library { sdk_version: "9", srcs: [ ":ipconnectivity-proto-src", + ":libstats_atom_enum_protos", "core/proto/**/*.proto", "libs/incident/proto/android/os/**/*.proto", ], @@ -958,6 +968,7 @@ java_library { srcs: [ ":ipconnectivity-proto-src", + ":libstats_atom_enum_protos", "core/proto/**/*.proto", "libs/incident/proto/android/os/**/*.proto", ], @@ -979,7 +990,9 @@ cc_defaults { proto: { export_proto_headers: true, - include_dirs: ["external/protobuf/src"], + include_dirs: [ + "external/protobuf/src", + ], }, cflags: [ @@ -990,6 +1003,7 @@ cc_defaults { srcs: [ ":ipconnectivity-proto-src", + ":libstats_atom_enum_protos", "core/proto/**/*.proto", ], } @@ -1321,8 +1335,6 @@ java_library { sdk_version: "module_current", min_sdk_version: "30", srcs: [ - "core/java/android/content/pm/BaseParceledListSlice.java", - "core/java/android/content/pm/ParceledListSlice.java", "core/java/android/os/HandlerExecutor.java", "core/java/com/android/internal/util/AsyncChannel.java", "core/java/com/android/internal/util/AsyncService.java", @@ -1341,12 +1353,6 @@ java_library { ], } -filegroup { - name: "framework-wifi-util-lib-aidls", - srcs: ["core/java/android/content/pm/ParceledListSlice.aidl"], - path: "core/java", -} - // utility classes statically linked into wifi-service filegroup { name: "framework-wifi-service-shared-srcs", |