From 76c875a7964c20e9d35ec12c976610b03a0a1d3c Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Wed, 26 Dec 2018 20:34:29 -0800 Subject: Update signature files to the new format The new format is described in tools/metalava/FORMAT.md. Fixes: 116589402 Switch signature files over to the v2 format Fixes: 112626813 Drop "synchronized" modifier from the signature format Fixes: 122358225 Omit overriding methods that only differ in final [...] Fixes: 73088715 API Review: Need doclava to output nullability Fixes: 79739773 API Review: Metalava enforcing constants are constant Exempt-From-Owner-Approval: Large-scale tooling change Test: make sdk, make update-api, make checkapi Merged-In: I8314f4e7099fa92e4f8ed7d283ccf836cc9a84a0 Change-Id: I828ec5ea2f879ebf8dd4ead651e9c9d2345f52e0 --- java/droiddoc.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java') diff --git a/java/droiddoc.go b/java/droiddoc.go index 055eb0733..0d2842a1f 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -72,7 +72,7 @@ var ( `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 ` + - `$bootclasspathArgs $classpathArgs $sourcepathArgs --no-banner --color --quiet ` + + `$bootclasspathArgs $classpathArgs $sourcepathArgs --no-banner --color --quiet --format=v2 ` + `$opts && ` + `${config.SoongZipCmd} -write_if_changed -jar -o $out -C $stubsDir -D $stubsDir`, CommandDeps: []string{ @@ -93,7 +93,7 @@ var ( 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 ` + - `$bootclasspathArgs $classpathArgs $sourcepathArgs --no-banner --color --quiet ` + + `$bootclasspathArgs $classpathArgs $sourcepathArgs --no-banner --color --quiet --format=v2 ` + `$opts && touch $out ) || ` + `( echo -e "$msg" ; exit 38 )`, CommandDeps: []string{ -- cgit v1.2.3-59-g8ed1b