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

Commit 2e52714b 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 

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



Change-Id: I0d8c76bb343ade1daae5e5e6c376463050e59c0d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e9f1e8d c11454b4

ProtoLibraries.bp

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

    ],



    tool_files: [

        ":libprotobuf-internal-protos",

    ],



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

        "&& $(location aprotoc) " +

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

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

    ],



    data: [

        ":libprotobuf-internal-protos",

    ],



    output_extension: "srcjar",

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

    ],



    tool_files: [

        ":libprotobuf-internal-protos",

    ],



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

        "&& $(location aprotoc) " +

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

    ],



    data: [

        ":libprotobuf-internal-protos",

    ],



    output_extension: "proto.h",

}