From b852a58aa6fe6063c78656569b0292b6e6d21ad7 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 10 Aug 2017 17:58:12 -0700 Subject: Convert soong java from soong_zip to jar soong_zip produces jar files that are not compatible with java's ZipInputStream. Switch to jar using ugly sed scripts to munge file lists into the alternating -C and file arguments required by jar. Bug: 64536066 Test: m -j checkbuild Test: build/soong/scripts/jar_args.sh --test Change-Id: Ifcc4bdab25e7d02342720eb246c673ff9a58bddb --- java/config/config.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'java/config/config.go') diff --git a/java/config/config.go b/java/config/config.go index 44651cb4..90d0fb51 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -53,7 +53,8 @@ func init() { pctx.SourcePathVariable("JarCmd", "${JavaToolchain}/jar") pctx.SourcePathVariable("JavadocCmd", "${JavaToolchain}/javadoc") - pctx.StaticVariable("SoongZipCmd", filepath.Join("${bootstrap.ToolDir}", "soong_zip")) + pctx.StaticVariable("Zip2ZipCmd", filepath.Join("${bootstrap.ToolDir}", "zip2zip")) + pctx.SourcePathVariable("JarArgsCmd", "build/soong/scripts/jar-args.sh") pctx.HostBinToolVariable("DxCmd", "dx") pctx.HostJavaToolVariable("JarjarCmd", "jarjar.jar") -- cgit v1.2.3