Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update build target names & code location for roleservice.proto usages in framework." into tm-dev

Browse Source
This commit is contained in:
Tyler Dewey
2022-03-08 14:35:35 +00:00
committed by Android (Google) Code Review
parent f7599ba9ee 4c5d89e69d
commit ff213ef74a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ProtoLibraries.bp
View File

@@ -40,7 +40,7 @@ gensrcs {
":libtombstone_proto-src", ":libtombstone_proto-src",
"core/proto/**/*.proto", "core/proto/**/*.proto",
"libs/incident/**/*.proto", "libs/incident/**/*.proto",
":service-permission-protos", ":service-permission-streaming-proto-sources",
], ],
output_extension: "srcjar", output_extension: "srcjar",
} }
@@ -70,7 +70,7 @@ gensrcs {
":libstats_atom_message_protos", ":libstats_atom_message_protos",
"core/proto/**/*.proto", "core/proto/**/*.proto",
"libs/incident/**/*.proto", "libs/incident/**/*.proto",
":service-permission-protos", ":service-permission-streaming-proto-sources",
], ],
output_extension: "proto.h", output_extension: "proto.h",
@@ -90,7 +90,7 @@ java_library_host {
"cmds/statsd/src/**/*.proto", "cmds/statsd/src/**/*.proto",
"core/proto/**/*.proto", "core/proto/**/*.proto",
"libs/incident/proto/**/*.proto", "libs/incident/proto/**/*.proto",
":service-permission-protos", ":service-permission-streaming-proto-sources",
], ],
proto: { proto: {
include_dirs: [ include_dirs: [
@@ -126,7 +126,7 @@ java_library {
":libstats_atom_message_protos", ":libstats_atom_message_protos",
"core/proto/**/*.proto", "core/proto/**/*.proto",
"libs/incident/proto/android/os/**/*.proto", "libs/incident/proto/android/os/**/*.proto",
":service-permission-protos", ":service-permission-streaming-proto-sources",
], ],
// Protos have lots of MissingOverride and similar. // Protos have lots of MissingOverride and similar.
errorprone: { errorprone: {
@@ -149,7 +149,7 @@ java_library {
":libstats_atom_message_protos", ":libstats_atom_message_protos",
"core/proto/**/*.proto", "core/proto/**/*.proto",
"libs/incident/proto/android/os/**/*.proto", "libs/incident/proto/android/os/**/*.proto",
":service-permission-protos", ":service-permission-streaming-proto-sources",
], ],
exclude_srcs: [ exclude_srcs: [
"core/proto/android/privacy.proto", "core/proto/android/privacy.proto",
@@ -186,7 +186,7 @@ cc_defaults {
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",
"core/proto/**/*.proto", "core/proto/**/*.proto",
":service-permission-protos", ":service-permission-streaming-proto-sources",
], ],
} }

2
core/proto/android/os/incident.proto
View File

@@ -62,7 +62,7 @@ import "frameworks/base/core/proto/android/privacy.proto";
import "frameworks/base/core/proto/android/section.proto"; import "frameworks/base/core/proto/android/section.proto";
import "frameworks/base/proto/src/ipconnectivity.proto"; import "frameworks/base/proto/src/ipconnectivity.proto";
import "packages/modules/Connectivity/framework/proto/netstats.proto"; import "packages/modules/Connectivity/framework/proto/netstats.proto";
import "packages/modules/Permission/service/proto/com/android/role/roleservice.proto"; import "packages/modules/Permission/service/proto/role_service.proto";
package android.os; package android.os;