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

Commit f06d3a98 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Work around b/70221552"

parents 9b04b2fd 159799d7
Loading
Loading
Loading
Loading
+12 −10
Original line number Diff line number Diff line
@@ -735,22 +735,24 @@ gensrcs {
    name: "framework-javastream-protos",
    depfile: true,

    tool_files: [ "tools/genprotos.sh", ],
    tools: [
        "aprotoc",
        "protoc-gen-javastream",
        "soong_zip",
    ],

    cmd: "mkdir -p $(genDir)/$(in) " +
        "&& $(location aprotoc) " +
        "  --plugin=$(location protoc-gen-javastream) " +
        "  --dependency_out=$(depfile) " +
        "  --javastream_out=$(genDir)/$(in) " +
        "  -Iexternal/protobuf/src " +
        "  -I . " +
    // TODO This should not be needed. If you set a custom OUT_DIR or OUT_DIR_COMMON_BASE you can
    // end up with a command that is extremely long, potentially going passed MAX_ARG_STRLEN due to
    // the way sbox rewrites the command. See b/70221552.
    cmd: "$(location tools/genprotos.sh) " +
              " $(location aprotoc) " +
              " $(location protoc-gen-javastream) " +
              " $(location soong_zip) " +
              " $(genDir) " +
              " $(depfile) " +
              " $(in) " +
        "&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)",

              " $(out)",
    srcs: [
        "core/proto/**/*.proto",
        "libs/incident/**/*.proto",

tools/genprotos.sh

0 → 100755
+24 −0
Original line number Diff line number Diff line
#!/bin/bash

# TODO This should not be needed. If you set a custom OUT_DIR or OUT_DIR_COMMON_BASE you can
# end up with a command that is extremely long, potentially going passed MAX_ARG_STRLEN due to
# the way sbox rewrites the command. See b/70221552.

set -e

location_aprotoc=$1
location_protoc=$2
location_soong_zip=$3
genDir=$4
depfile=$5
in=$6
out=$7

mkdir -p ${genDir}/${in} && \
  ${location_aprotoc} --plugin=${location_protoc} \
                      --dependency_out=${depfile} \
                      --javastream_out=${genDir}/${in} \
                      -Iexternal/protobuf/src \
                      -I . \
                      ${in} && \
  ${location_soong_zip} -jar -o ${out} -C ${genDir}/${in} -D ${genDir}/${in}