Revert "Also package recursive jni_libs deps of android_apps as well as direct deps."

This reverts commit 6f907ad3dd.

Reason for revert: Broke FrameworksNetSmokeTests

Bug: 146456945
Change-Id: Ibef7bb80c532e70cfcfb974f51a99ed25437a343
This commit is contained in:
Lorenzo Colitti
2019-12-18 00:15:07 +00:00
parent 6f907ad3dd
commit 2973c1106f
6 changed files with 25 additions and 72 deletions

View File

@@ -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{