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

Commit b499bfd1 authored by Yu Liu's avatar Yu Liu Committed by Automerger Merge Worker
Browse files

Merge "Use new data property to sandbox stream protos" am: c11454b4 am: 2e52714b 

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



Change-Id: Ibf61f47b9fab553cddf99415f6c2d37f467df9e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6998ac7 2e52714b

ProtoLibraries.bp

+9 −8
Original line number Original line Diff line number Diff line
@@ -21,10 +21,6 @@ gensrcs { 
        "soong_zip",

        "soong_zip",

    ],

    ],





    tool_files: [

        ":libprotobuf-internal-protos",

    ],



    cmd: "mkdir -p $(genDir)/$(in) " +

    cmd: "mkdir -p $(genDir)/$(in) " +

        "&& $(location aprotoc) " +

        "&& $(location aprotoc) " +

        "  --plugin=$(location protoc-gen-javastream) " +

        "  --plugin=$(location protoc-gen-javastream) " +
@@ -43,6 +39,11 @@ gensrcs { 
        "libs/incident/**/*.proto",

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

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

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

    ],

    ],



    data: [

        ":libprotobuf-internal-protos",

    ],



    output_extension: "srcjar",

    output_extension: "srcjar",

}

}
@@ -54,10 +55,6 @@ gensrcs { 
        "protoc-gen-cppstream",

        "protoc-gen-cppstream",

    ],

    ],





    tool_files: [

        ":libprotobuf-internal-protos",

    ],



    cmd: "mkdir -p $(genDir) " +

    cmd: "mkdir -p $(genDir) " +

        "&& $(location aprotoc) " +

        "&& $(location aprotoc) " +

        "  --plugin=$(location protoc-gen-cppstream) " +

        "  --plugin=$(location protoc-gen-cppstream) " +
@@ -75,6 +72,10 @@ gensrcs { 
        ":service-permission-streaming-proto-sources",

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

    ],

    ],





    data: [

        ":libprotobuf-internal-protos",

    ],



    output_extension: "proto.h",

    output_extension: "proto.h",

}

}