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

Commit e247dbe5 authored by Hai Zhang's avatar Hai Zhang
Browse files

Remove service-permission-streaming-proto-sources from platform. 

Fixes: 246812597
Test: build
Change-Id: Ide9ff8a3b6009df33418e46aebd75d66be4907e4
parent 888772b3

ProtoLibraries.bp

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

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

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

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

    ],

    output_extension: "srcjar",

}
@@ -72,7 +71,6 @@ gensrcs { 
        ":libstats_atom_message_protos",

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

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

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

    ],



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

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

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

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

    ],

    proto: {

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

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

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

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

    ],

    // Protos have lots of MissingOverride and similar.

    errorprone: {
@@ -148,7 +144,6 @@ java_library { 
        ":libstats_atom_message_protos",

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

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

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

    ],

    exclude_srcs: [

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

        ":libstats_atom_message_protos",

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

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

    ],

}

core/proto/android/os/incident.proto

+1 −5
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import "frameworks/base/core/proto/android/util/textdump.proto"; 
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/Permission/service/proto/role_service.proto";



package android.os;
@@ -358,10 +357,7 @@ message IncidentProto { 
        (section).userdebug_and_eng_only = true

    ];



    optional com.android.role.RoleServiceDumpProto role = 3024 [

        (section).type = SECTION_DUMPSYS,

        (section).args = "role --proto"

    ];

    reserved 3024;



    optional android.service.restricted_image.RestrictedImagesDumpProto restricted_images = 3025 [

        (section).type = SECTION_DUMPSYS,