diff options
| author | Colin Cross <ccross@android.com> | 2019-02-05 21:55:21 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-02-08 15:24:47 +0000 |
| commit | e4246abd7f456eb4119f2cffc01bdfca852584b5 (patch) | |
| tree | da9d75703d09106d677b1d5b8976a6cdc601e6ce /java/app_builder.go | |
| parent | 129b9ceeb147099a62c46b4ff74670bb1670e34b (diff) | |
| download | android_build_soong-e4246abd7f456eb4119f2cffc01bdfca852584b5.tar.gz android_build_soong-e4246abd7f456eb4119f2cffc01bdfca852584b5.tar.bz2 android_build_soong-e4246abd7f456eb4119f2cffc01bdfca852584b5.zip | |
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
Diffstat (limited to 'java/app_builder.go')
| -rw-r--r-- | java/app_builder.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index 5b999d83..6cc21595 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -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") } |