Skip to content

Commit 4c5d89e

Browse files
author
Tyler Dewey
committed
Update build target names & code location for roleservice.proto usages
in framework. Bug: 217406624 Test: built and flashed Change-Id: Ibcb924df059af5d518b7f6f80487a3fb57bd6623
1 parent 714fe08 commit 4c5d89e

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

ProtoLibraries.bp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ gensrcs {
4040
":libtombstone_proto-src",
4141
"core/proto/**/*.proto",
4242
"libs/incident/**/*.proto",
43-
":service-permission-protos",
43+
":service-permission-streaming-proto-sources",
4444
],
4545
output_extension: "srcjar",
4646
}
@@ -70,7 +70,7 @@ gensrcs {
7070
":libstats_atom_message_protos",
7171
"core/proto/**/*.proto",
7272
"libs/incident/**/*.proto",
73-
":service-permission-protos",
73+
":service-permission-streaming-proto-sources",
7474
],
7575

7676
output_extension: "proto.h",
@@ -90,7 +90,7 @@ java_library_host {
9090
"cmds/statsd/src/**/*.proto",
9191
"core/proto/**/*.proto",
9292
"libs/incident/proto/**/*.proto",
93-
":service-permission-protos",
93+
":service-permission-streaming-proto-sources",
9494
],
9595
proto: {
9696
include_dirs: [
@@ -126,7 +126,7 @@ java_library {
126126
":libstats_atom_message_protos",
127127
"core/proto/**/*.proto",
128128
"libs/incident/proto/android/os/**/*.proto",
129-
":service-permission-protos",
129+
":service-permission-streaming-proto-sources",
130130
],
131131
// Protos have lots of MissingOverride and similar.
132132
errorprone: {
@@ -149,7 +149,7 @@ java_library {
149149
":libstats_atom_message_protos",
150150
"core/proto/**/*.proto",
151151
"libs/incident/proto/android/os/**/*.proto",
152-
":service-permission-protos",
152+
":service-permission-streaming-proto-sources",
153153
],
154154
exclude_srcs: [
155155
"core/proto/android/privacy.proto",
@@ -186,7 +186,7 @@ cc_defaults {
186186
":libstats_atom_enum_protos",
187187
":libstats_atom_message_protos",
188188
"core/proto/**/*.proto",
189-
":service-permission-protos",
189+
":service-permission-streaming-proto-sources",
190190
],
191191
}
192192

core/proto/android/os/incident.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import "frameworks/base/core/proto/android/privacy.proto";
6262
import "frameworks/base/core/proto/android/section.proto";
6363
import "frameworks/base/proto/src/ipconnectivity.proto";
6464
import "packages/modules/Connectivity/framework/proto/netstats.proto";
65-
import "packages/modules/Permission/service/proto/com/android/role/roleservice.proto";
65+
import "packages/modules/Permission/service/proto/role_service.proto";
6666

6767
package android.os;
6868

0 commit comments

Comments
 (0)