diff options
| author | Torne (Richard Coles) <torne@google.com> | 2020-03-25 18:11:31 -0400 |
|---|---|---|
| committer | Richard Coles <torne@google.com> | 2020-03-25 22:16:16 +0000 |
| commit | c65135850965031874ffc4795c6c1cf7e1e603af (patch) | |
| tree | a2d642786366f04f97feee800e7ab92e2b8fc371 | |
| parent | 43bebd30d78b44fc762548dccf321cb10cbaf10a (diff) | |
| download | chromium-webview-c65135850965031874ffc4795c6c1cf7e1e603af.tar.gz | |
Remove undesirable JNI lib list in makefile.
We were listing the JNI libraries explicitly with
LOCAL_PREBUILT_JNI_LIBS in the WebView prebuilt makefile - this hasn't
been necessary for some time, and actually causes any other .so in the
APK to be removed at build time, which is now removing the crashpad
trampoline .so and probably causing crashpad to not work correctly on
the preinstalled version as a result.
Just drop it entirely - the .so files are all preserved in the APK by
default.
Fixes: 152435891
Test: m; examine /product/app/webview/webview.apk
Change-Id: I047c0aedc4b332897a32a7f3a75a036d36b32bc1
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -33,9 +33,4 @@ LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64 my_src_arch := $(call get-prebuilt-src-arch,$(LOCAL_MODULE_TARGET_ARCH)) LOCAL_SRC_FILES := prebuilt/$(my_src_arch)/webview.apk -LOCAL_PREBUILT_JNI_LIBS_arm := @lib/armeabi-v7a/libwebviewchromium.so -LOCAL_PREBUILT_JNI_LIBS_arm64 := @lib/arm64-v8a/libwebviewchromium.so -LOCAL_PREBUILT_JNI_LIBS_x86 := @lib/x86/libwebviewchromium.so -LOCAL_PREBUILT_JNI_LIBS_x86_64 := @lib/x86_64/libwebviewchromium.so - include $(BUILD_PREBUILT) |