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

Commit b4be0928 authored by Alexander Smundak's avatar Alexander Smundak
Browse files

Revert "Revert "Print full diagnostics file when Java process crashes."" 

This reverts commit d71dc6b5.

Reason for revert: ag/974065 fixes the problem that caused the revert

Change-Id: I3ba9eecdab34602aaf19fa518520ac932c9b97af
parent d71dc6b5

java/app_builder.go

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import ( 
var (

	Signapk = pctx.AndroidStaticRule("signapk",

		blueprint.RuleParams{

			Command: `${config.JavaCmd} -Djava.library.path=$$(dirname $signapkJniLibrary) ` +

			Command: `${config.JavaCmd} ${config.JavaVmFlags} -Djava.library.path=$$(dirname $signapkJniLibrary) ` +

				`-jar $signapkCmd $flags $certificates $in $out`,

			CommandDeps: []string{"$signapkCmd", "$signapkJniLibrary"},

		},

java/builder.go

+5 −4
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ var ( 
			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} ` +

				`${config.SoongJavacWrapper} ${config.JavacWrapper}${config.JavacCmd} ` +

				`${config.JavacHeapFlags} ${config.JavacVmFlags} ${config.CommonJdkFlags} ` +

				`$processorpath $processor $javacFlags $bootClasspath $classpath ` +

				`-source $javaVersion -target $javaVersion ` +

				`-d $outDir -s $annoDir @$out.rsp @$srcJarDir/list ; fi ) && ` +
@@ -64,7 +65,7 @@ var ( 
	turbine = pctx.AndroidStaticRule("turbine",

		blueprint.RuleParams{

			Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` +

				`${config.JavaCmd} -jar ${config.TurbineJar} --output $out.tmp ` +

				`${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.TurbineJar} --output $out.tmp ` +

				`--temp_dir "$outDir" --sources @$out.rsp  --source_jars $srcJars ` +

				`--javacopts ${config.CommonJdkFlags} ` +

				`$javacFlags -source $javaVersion -target $javaVersion -- $bootClasspath $classpath && ` +
@@ -108,7 +109,7 @@ var ( 


	jarjar = pctx.AndroidStaticRule("jarjar",

		blueprint.RuleParams{

			Command:     "${config.JavaCmd} -jar ${config.JarjarCmd} process $rulesFile $in $out",

			Command:     "${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.JarjarCmd} process $rulesFile $in $out",

			CommandDeps: []string{"${config.JavaCmd}", "${config.JarjarCmd}", "$rulesFile"},

		},

		"rulesFile")
@@ -124,7 +125,7 @@ var ( 


	jetifier = pctx.AndroidStaticRule("jetifier",

		blueprint.RuleParams{

			Command:     "${config.JavaCmd} -jar ${config.JetifierJar} -l error -o $out -i $in",

			Command:     "${config.JavaCmd}  ${config.JavaVmFlags} -jar ${config.JetifierJar} -l error -o $out -i $in",

			CommandDeps: []string{"${config.JavaCmd}", "${config.JetifierJar}"},

		},

	)

java/config/config.go

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ func init() { 
		// b/65004097: prevent using java.lang.invoke.StringConcatFactory when using -target 1.9

		`-XDstringConcat=inline`,

	}, " "))

	pctx.StaticVariable("JavaVmFlags", "-XX:OnError=\"cat hs_err_pid%p.log\"")

	pctx.StaticVariable("JavacVmFlags", "-J-XX:OnError=\"cat hs_err_pid%p.log\"")



	pctx.VariableConfigMethod("hostPrebuiltTag", android.Config.PrebuiltOS)

java/config/makevars.go

+4 −4
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ func makeVarsProvider(ctx android.MakeVarsContext) { 
	ctx.Strict("ANDROID_JAVA8_HOME", "prebuilts/jdk/jdk8/${hostPrebuiltTag}")

	ctx.Strict("ANDROID_JAVA9_HOME", "prebuilts/jdk/jdk9/${hostPrebuiltTag}")

	ctx.Strict("ANDROID_JAVA_TOOLCHAIN", "${JavaToolchain}")

	ctx.Strict("JAVA", "${JavaCmd}")

	ctx.Strict("JAVAC", "${JavacCmd}")

	ctx.Strict("JAVA", "${JavaCmd} ${JavaVmFlags}")

	ctx.Strict("JAVAC", "${JavacCmd} ${JavacVmFlags}")

	ctx.Strict("JAR", "${JarCmd}")

	ctx.Strict("JAR_ARGS", "${JarArgsCmd}")

	ctx.Strict("JAVADOC", "${JavadocCmd}")
@@ -58,8 +58,8 @@ func makeVarsProvider(ctx android.MakeVarsContext) { 
		ctx.Strict("ERROR_PRONE_CHECKS", "${ErrorProneChecks}")

	}



	ctx.Strict("TARGET_JAVAC", "${JavacCmd} ${CommonJdkFlags}")

	ctx.Strict("HOST_JAVAC", "${JavacCmd} ${CommonJdkFlags}")

	ctx.Strict("TARGET_JAVAC", "${JavacCmd}  ${JavacVmFlags} ${CommonJdkFlags}")

	ctx.Strict("HOST_JAVAC", "${JavacCmd}  ${JavacVmFlags} ${CommonJdkFlags}")



	ctx.Strict("JLINK", "${JlinkCmd}")

	ctx.Strict("JMOD", "${JmodCmd}")

java/droiddoc.go

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ var ( 
			Command: `rm -rf "$outDir" "$srcJarDir" "$stubsDir" && ` +

				`mkdir -p "$outDir" "$srcJarDir" "$stubsDir" && ` +

				`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +

				`${config.JavaCmd} -jar ${config.MetalavaJar} -encoding UTF-8 -source $javaVersion @$out.rsp @$srcJarDir/list ` +

				`${config.JavaCmd}  ${config.JavaVmFlags} -jar ${config.MetalavaJar} -encoding UTF-8 -source $javaVersion @$out.rsp @$srcJarDir/list ` +

				`$bootclasspathArgs $classpathArgs $sourcepathArgs --no-banner --color --quiet --format=v2 ` +

				`$opts && ` +

				`${config.SoongZipCmd} -write_if_changed -jar -o $out -C $stubsDir -D $stubsDir && ` +
@@ -95,7 +95,7 @@ var ( 
		blueprint.RuleParams{

			Command: `( rm -rf "$srcJarDir" && mkdir -p "$srcJarDir" && ` +

				`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +

				`${config.JavaCmd} -jar ${config.MetalavaJar} -encoding UTF-8 -source $javaVersion @$out.rsp @$srcJarDir/list ` +

				`${config.JavaCmd}  ${config.JavaVmFlags} -jar ${config.MetalavaJar} -encoding UTF-8 -source $javaVersion @$out.rsp @$srcJarDir/list ` +

				`$bootclasspathArgs $classpathArgs $sourcepathArgs --no-banner --color --quiet --format=v2 ` +

				`$opts && touch $out && rm -rf "$srcJarDir") || ` +

				`( echo -e "$msg" ; exit 38 )`,
@@ -120,7 +120,7 @@ var ( 
			Command: `rm -rf "$outDir" "$srcJarDir" "$stubsDir" && ` +

				`mkdir -p "$outDir" "$srcJarDir" "$stubsDir" && ` +

				`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +

				`${config.JavaCmd} -jar ${config.DokkaJar} $srcJarDir ` +

				`${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.DokkaJar} $srcJarDir ` +

				`$classpathArgs -format dac -dacRoot /reference/kotlin -output $outDir $opts && ` +

				`${config.SoongZipCmd} -write_if_changed -d -o $docZip -C $outDir -D $outDir && ` +

				`${config.SoongZipCmd} -write_if_changed -jar -o $out -C $stubsDir -D $stubsDir && ` +