From 2973c1106fc92216e208d5096bd69414a7f13ca4 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Wed, 18 Dec 2019 00:15:07 +0000 Subject: Revert "Also package recursive jni_libs deps of android_apps as well as direct deps." This reverts commit 6f907ad3ddad9eb0e928ff7ad7965fa17a8a6946. Reason for revert: Broke FrameworksNetSmokeTests Bug: 146456945 Change-Id: Ibef7bb80c532e70cfcfb974f51a99ed25437a343 --- java/app_builder.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'java/app_builder.go') diff --git a/java/app_builder.go b/java/app_builder.go index 5e7fbe6de..ec2f6dafe 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -200,14 +200,14 @@ func TransformJniLibsToJar(ctx android.ModuleContext, outputFile android.Writabl } if uncompressJNI { - jarArgs = append(jarArgs, "-L", "0") + jarArgs = append(jarArgs, "-L 0") } for _, j := range jniLibs { deps = append(deps, j.path) jarArgs = append(jarArgs, - "-P", targetToJniDir(j.target), - "-f", j.path.String()) + "-P "+targetToJniDir(j.target), + "-f "+j.path.String()) } ctx.Build(pctx, android.BuildParams{ -- cgit v1.2.3-59-g8ed1b