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
diff --git a/java/app_builder.go b/java/app_builder.go
index 5e7fbe6..ec2f6da 100644
--- a/java/app_builder.go
+++ b/java/app_builder.go
@@ -200,14 +200,14 @@
}
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{