diff options
| author | 2017-12-05 05:52:02 +0000 | |
|---|---|---|
| committer | 2017-12-05 05:52:02 +0000 | |
| commit | f62c26562f150109d9498488ffb9798e4e2a84d8 (patch) | |
| tree | bde357af14124cea5ef24ea0866ffb1ad9671faa | |
| parent | 0c3b9cd0d5f71c0c1b4bce4308a1f0ae0a3fa600 (diff) | |
| parent | b8e4d0e5614d0d287db9fa20f5f1b72f8f3f1630 (diff) | |
Merge "Don't use path to find protoc-gen-javastream" am: 1a2a45667b am: 1c578e8032
am: b8e4d0e561
Change-Id: I4a9d4dfb15d958b28cf329c5ebc0009654345fbf
| -rw-r--r-- | Android.bp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index 32adc1c5a5de..81cd65c95803 100644 --- a/Android.bp +++ b/Android.bp @@ -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 " + |