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

Commit f62c2656 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Don't use path to find protoc-gen-javastream" am: 1a2a4566 am: 1c578e80 

am: b8e4d0e5

Change-Id: I4a9d4dfb15d958b28cf329c5ebc0009654345fbf
parents 0c3b9cd0 b8e4d0e5

Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -639,11 +639,9 @@ gensrcs { 
        "soong_zip",

    ],



    // Append protoc-gen-javastream tool's PATH otherwise aprotoc can't find the plugin tool

    cmd: "export PATH=$$PATH:$$(dirname $(location protoc-gen-javastream)) " +

        "&& mkdir -p $(genDir)/$(in) " +

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

        "&& $(location aprotoc) " +

        "  --plugin=protoc-gen-java-stream=protoc-gen-javastream " +

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

        "  --dependency_out=$(depfile) " +

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

        "  -Iexternal/protobuf/src " +