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

Commit 0c076f37 authored by Vinh Tran's avatar Vinh Tran Committed by Automerger Merge Worker
Browse files

Merge "Remove uses of depfile in gensrcs modules" am: 892f6a93 am:... 

Merge "Remove uses of depfile in gensrcs modules" am: 892f6a93 am: 8bfca500 am: 1bf20c04 am: 46ee8292 am: 4a8d3f8a

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



Change-Id: Id543321e93b7a77f0bf54767c7bcec0698f703c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1d77602 4a8d3f8a

ProtoLibraries.bp

+8 −4
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


gensrcs {

    name: "framework-javastream-protos",

    depfile: true,



    tools: [

        "aprotoc",
@@ -22,10 +21,13 @@ gensrcs { 
        "soong_zip",

    ],



    tool_files: [

        ":libprotobuf-internal-protos",

    ],



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

        "&& $(location aprotoc) " +

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

        "  --dependency_out=$(depfile) " +

        "  --javastream_out=$(genDir)/$(in) " +

        "  -Iexternal/protobuf/src " +

        "  -I . " +
@@ -47,17 +49,19 @@ gensrcs { 


gensrcs {

    name: "framework-cppstream-protos",

    depfile: true,



    tools: [

        "aprotoc",

        "protoc-gen-cppstream",

    ],



    tool_files: [

        ":libprotobuf-internal-protos",

    ],



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

        "&& $(location aprotoc) " +

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

        "  --dependency_out=$(depfile) " +

        "  --cppstream_out=$(genDir) " +

        "  -Iexternal/protobuf/src " +

        "  -I . " +