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 /androidmk | |
| parent | 129b9ceeb147099a62c46b4ff74670bb1670e34b (diff) | |
| download | build_soong-e4246abd7f456eb4119f2cffc01bdfca852584b5.tar.gz build_soong-e4246abd7f456eb4119f2cffc01bdfca852584b5.tar.bz2 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 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index aef8944d..abe79179 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -188,6 +188,7 @@ func init() { "LOCAL_EXPORT_PACKAGE_RESOURCES": "export_package_resources", "LOCAL_PRIVILEGED_MODULE": "privileged", "LOCAL_AAPT_INCLUDE_ALL_RESOURCES": "aapt_include_all_resources", + "LOCAL_USE_EMBEDDED_NATIVE_LIBS": "use_embedded_native_libs", "LOCAL_DEX_PREOPT": "dex_preopt.enabled", "LOCAL_DEX_PREOPT_APP_IMAGE": "dex_preopt.app_image", |