commit ccbf59304645dde557e24e7a8dd1440111d1a3ce
author Ying Wang <wangying@google.com> Mon Jun 30 18:25:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 30 18:25:37 2014 +0000
tree 7b1fc39dbd35c6ae1b7457d45b4c50d7a1f7f95d
parent 9e05c9e4e642673dc6d9104c44d26810773c382d
parent 51254e6c6065c0c771886472853e6dbc5377c6ae

am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs."

* commit '51254e6c6065c0c771886472853e6dbc5377c6ae':
  Fix missing rs_compatibility_jni_libs.

core/install_jni_libs.mk

diff --git a/core/install_jni_libs.mk b/core/install_jni_libs.mk
index 918a839..da3032d 100644
--- a/core/install_jni_libs.mk
+++ b/core/install_jni_libs.mk
@@ -56,6 +56,8 @@
 # Include RS dynamically-generated libraries as well
 # TODO: Add multilib support once RS supports generating multilib libraries.
 jni_shared_libraries += $(rs_compatibility_jni_libs)
+jni_shared_libraries_with_abis += $(addprefix $(my_jni_shared_libraries_abi):,\
+    $(rs_compatibility_jni_libs))
 endif  # my_add_jni
 
 #######################################