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

Commit baae3a9d 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 am: b499bfd1 

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



Change-Id: Ibed3e34ea88a3793c781adb3a2d66d51df641e4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b7870229 b499bfd1

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) " +
@@ -42,6 +38,11 @@ gensrcs { 
        "core/proto/**/*.proto",

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

    ],



    data: [

        ":libprotobuf-internal-protos",

    ],



    output_extension: "srcjar",

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

    ],



    tool_files: [

        ":libprotobuf-internal-protos",

    ],



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

        "&& $(location aprotoc) " +

        "  --plugin=$(location protoc-gen-cppstream) " +
@@ -73,6 +70,10 @@ gensrcs { 
        "libs/incident/**/*.proto",

    ],



    data: [

        ":libprotobuf-internal-protos",

    ],



    output_extension: "proto.h",

}