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:
Colin Cross
2019-02-05 21:55:21 -08:00
parent 129b9ceeb1
commit e4246abd7f
8 changed files with 118 additions and 14 deletions

View File

@@ -122,8 +122,8 @@ var (
zipalign = pctx.AndroidStaticRule("zipalign",
blueprint.RuleParams{
Command: "if ! ${config.ZipAlign} -c 4 $in > /dev/null; then " +
"${config.ZipAlign} -f 4 $in $out; " +
Command: "if ! ${config.ZipAlign} -c -p 4 $in > /dev/null; then " +
"${config.ZipAlign} -f -p 4 $in $out; " +
"else " +
"cp -f $in $out; " +
"fi",