aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/merge_zips
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-10-23 18:12:27 -0700
committerColin Cross <ccross@android.com>2017-10-24 16:01:44 -0700
commit5c6ecc179f0dfc1026a65531bcf923bbfe4ac1e9 (patch)
tree2f13337dd7bcac58b7573cd681e4bc38a8d62b87 /cmd/merge_zips
parent17ae970a92a8e822631279ea8ff430a46d0735cf (diff)
downloadbuild_soong-5c6ecc179f0dfc1026a65531bcf923bbfe4ac1e9.tar.gz
build_soong-5c6ecc179f0dfc1026a65531bcf923bbfe4ac1e9.tar.bz2
build_soong-5c6ecc179f0dfc1026a65531bcf923bbfe4ac1e9.zip
Don't panic in turbine with no classes
ALLOW_MISSING_DEPENDENCIES=true can cause missing dependencies to be hidden from GenerateAndroidBuildActions, which is triggering the len(jars) == 0 check in compileJavaHeader. For the ALLOW_MISSING_DEPENDENCIES=true case the check is unnecessary, as the build rules will be replaced with runtime errors. On the off chance the check would have been hit in a real build, allow merge_zips to create an empty zip file if it is asked to. Test: m ALLOW_MISSING_DEPENDENCIES=true Change-Id: I3171f921d51229ddf38a1a647d32566658c673fa
Diffstat (limited to 'cmd/merge_zips')
-rw-r--r--cmd/merge_zips/merge_zips.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/merge_zips/merge_zips.go b/cmd/merge_zips/merge_zips.go
index e16c00ef..207b161c 100644
--- a/cmd/merge_zips/merge_zips.go
+++ b/cmd/merge_zips/merge_zips.go
@@ -78,7 +78,7 @@ func main() {
// parse args
flag.Parse()
args := flag.Args()
- if len(args) < 2 {
+ if len(args) < 1 {
flag.Usage()
os.Exit(1)
}