From 24a099c3b857f1b6fec2dbbb6c4ae1a67cece9da Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Thu, 28 Jun 2018 14:53:20 +0900 Subject: [PATCH] Add condtion to avoid build error If docs file which is result of javadoc is null, there is a build error when building stubs file. To avoid build error, we don't build if srcJar files is exist but they don't have java file list. Bug:77577799 Test: make -j Test: Marking @hide to all APIs in javax.obex library -> make -j -> check build result. result is success Change-Id: I85439417a36425e89a8fa2ecbc66d1b2022bc63a --- java/builder.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/builder.go b/java/builder.go index 1944e698a..15e963136 100644 --- a/java/builder.go +++ b/java/builder.go @@ -41,10 +41,11 @@ var ( blueprint.RuleParams{ Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + + `(if [ -s $srcJarDir/list ] || [ -s $out.rsp ] ; then ` + `${config.SoongJavacWrapper} ${config.JavacWrapper}${config.JavacCmd} ${config.JavacHeapFlags} ${config.CommonJdkFlags} ` + `$processorpath $javacFlags $bootClasspath $classpath ` + `-source $javaVersion -target $javaVersion ` + - `-d $outDir -s $annoDir @$out.rsp @$srcJarDir/list && ` + + `-d $outDir -s $annoDir @$out.rsp @$srcJarDir/list ; fi ) && ` + `${config.SoongZipCmd} -jar -o $out -C $outDir -D $outDir`, CommandDeps: []string{ "${config.JavacCmd}",