Cherry Pick Generate symlinks to libwebviewchromium.so in /system/priv-app
This change declares libwebviewchromium to be treated as a JNI lib
for the webviewchromium.apk. By doing this, the build system will
create symlinks from /system/app-priv/webviewchromium/lib/...
(which is the path returned by the package manager) to the actual
libraries in /system/lib*.
Furthermore this change also declares the apk to be a multilib
target, so that both libraries get symlinked on multi-arch devices.
Original BUG:16403706
Original Change-Id: Ib02191eddf8262b2b23c3c32d07e77b33759285d
Conflicts:
chromium/Android.mk
Bug: 16723226
Change-Id: Ib420a18d14a9464f92d1e05c290b0e10225f5985
diff --git a/chromium/Android.mk b/chromium/Android.mk
index 3f0fafa..9676bac 100644
--- a/chromium/Android.mk
+++ b/chromium/Android.mk
@@ -43,6 +43,10 @@
LOCAL_AAPT_FLAGS := $(android_webview_aapt_flags)
LOCAL_AAPT_FLAGS += --shared-lib
+LOCAL_JNI_SHARED_LIBRARIES += libwebviewchromium
+
+LOCAL_MULTILIB := both
+
# TODO: filter webviewchromium_webkit_strings based on PRODUCT_LOCALES.
LOCAL_REQUIRED_MODULES := \
libwebviewchromium \
