Make manifest and APK agree on uncompressed native libs
Only put uncompressed native libs in an APK if the min_sdk_version supports it (>= 23, Marshmallow), and set android:extractNativeLibs="false" in the AndroidManifest.xml so that the platform won't extract them anyways. Bug: 117618214 Test: m checkbuild Change-Id: I760017e48bf3c6b618aabde0982df45995765d48
This commit is contained in:
@@ -200,14 +200,14 @@ func BuildBundleModule(ctx android.ModuleContext, outputFile android.WritablePat
|
||||
}
|
||||
|
||||
func TransformJniLibsToJar(ctx android.ModuleContext, outputFile android.WritablePath,
|
||||
jniLibs []jniLib) {
|
||||
jniLibs []jniLib, uncompressJNI bool) {
|
||||
|
||||
var deps android.Paths
|
||||
jarArgs := []string{
|
||||
"-j", // junk paths, they will be added back with -P arguments
|
||||
}
|
||||
|
||||
if !ctx.Config().UnbundledBuild() {
|
||||
if uncompressJNI {
|
||||
jarArgs = append(jarArgs, "-L 0")
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user