Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b89f7803 authored by Tyler Dewey's avatar Tyler Dewey Committed by Automerger Merge Worker
Browse files

Merge "Update build target names & code location for roleservice.proto usages... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17049504

Change-Id: I82606ab9a87d25e89501b065a3bcd38a9a5a6b6a
parents eb24a9ce ff213ef7

ProtoLibraries.bp

+6 −6
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ gensrcs { 
        ":libtombstone_proto-src",

        "core/proto/**/*.proto",

        "libs/incident/**/*.proto",

        ":service-permission-protos",

        ":service-permission-streaming-proto-sources",

    ],

    output_extension: "srcjar",

}
@@ -70,7 +70,7 @@ gensrcs { 
        ":libstats_atom_message_protos",

        "core/proto/**/*.proto",

        "libs/incident/**/*.proto",

        ":service-permission-protos",

        ":service-permission-streaming-proto-sources",

    ],



    output_extension: "proto.h",
@@ -90,7 +90,7 @@ java_library_host { 
        "cmds/statsd/src/**/*.proto",

        "core/proto/**/*.proto",

        "libs/incident/proto/**/*.proto",

        ":service-permission-protos",

        ":service-permission-streaming-proto-sources",

    ],

    proto: {

        include_dirs: [
@@ -126,7 +126,7 @@ java_library { 
        ":libstats_atom_message_protos",

        "core/proto/**/*.proto",

        "libs/incident/proto/android/os/**/*.proto",

        ":service-permission-protos",

        ":service-permission-streaming-proto-sources",

    ],

    // Protos have lots of MissingOverride and similar.

    errorprone: {
@@ -149,7 +149,7 @@ java_library { 
        ":libstats_atom_message_protos",

        "core/proto/**/*.proto",

        "libs/incident/proto/android/os/**/*.proto",

        ":service-permission-protos",

        ":service-permission-streaming-proto-sources",

    ],

    exclude_srcs: [

        "core/proto/android/privacy.proto",
@@ -186,7 +186,7 @@ cc_defaults { 
        ":libstats_atom_enum_protos",

        ":libstats_atom_message_protos",

        "core/proto/**/*.proto",

        ":service-permission-protos",

        ":service-permission-streaming-proto-sources",

    ],

}

core/proto/android/os/incident.proto

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ import "frameworks/base/core/proto/android/privacy.proto"; 
import "frameworks/base/core/proto/android/section.proto";

import "frameworks/base/proto/src/ipconnectivity.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;