Merge "Ensure extracted JNIs are stored properly in APKs" into main (a7c5278f) · Commits · e / os / android_build_soong

java/app_builder.go

+13 −1

Original line number	Diff line number	Diff line
		@@ -268,14 +268,26 @@ func TransformJniLibsToJar(
		Args: args,
		})
		if len(prebuiltJniPackages) > 0 {
		var mergeJniJarPath android.WritablePath = android.PathForModuleOut(ctx, "mergeJniJarOutput.zip")
		if !uncompressJNI {
		mergeJniJarPath = outputFile
		}
		ctx.Build(pctx, android.BuildParams{
		Rule: mergeAssetsRule,
		Description: "merge prebuilt JNI packages",
		Inputs: append(prebuiltJniPackages, jniJarPath),
		Output: mergeJniJarPath,
		})

		if uncompressJNI {
		ctx.Build(pctx, android.BuildParams{
		Rule: uncompressEmbeddedJniLibsRule,
		Input: mergeJniJarPath,
		Output: outputFile,
		})
		}
		}
		}

		func (a *AndroidApp) generateJavaUsedByApex(ctx android.ModuleContext) {
		javaApiUsedByOutputFile := android.PathForModuleOut(ctx, a.installApkName+"_using.xml")