diff options
author | Colin Cross <ccross@android.com> | 2017-11-17 21:32:27 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-17 21:32:27 +0000 |
commit | 6dfde48ba1dff752950144161313ad226d0e44d1 (patch) | |
tree | 00a8a68c56a2a699ac3a47b9377744608a19e275 /scripts | |
parent | fd9b570c5e33528f2584e0dfa73dbfedc91fd332 (diff) | |
parent | 35143d0466461f5d83dfc7aeda53b36a274f8cc8 (diff) | |
download | build_soong-6dfde48ba1dff752950144161313ad226d0e44d1.tar.gz build_soong-6dfde48ba1dff752950144161313ad226d0e44d1.tar.bz2 build_soong-6dfde48ba1dff752950144161313ad226d0e44d1.zip |
Merge changes from topics "soong_logtags", "droiddoc_srcjars"
* changes:
Fix genrules depending on Go tools
Use logtags without merged file
Export extract-srcjars.sh to Make
Remove partial javastream proto support
Add support for .srcjar files from genrules and srcs
Fix java AIDL properties to match C/C++
Fix proto flags in java
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/extract-srcjars.sh (renamed from scripts/extract-src-jars.sh) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/scripts/extract-src-jars.sh b/scripts/extract-srcjars.sh index 918cf8a5..918cf8a5 100755 --- a/scripts/extract-src-jars.sh +++ b/scripts/extract-srcjars.sh |