commit 9327f77a01828e0d13dc32be295d6338fe339abc
author Ying Wang <wangying@google.com> Mon Jun 30 18:30:46 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 30 18:30:46 2014 +0000
tree d5d5164ab2450780ad5349b319fe90f1d323c5b2
parent 556efe002f852dfa5ca5331e92b1d65a32339f26
parent ccbf59304645dde557e24e7a8dd1440111d1a3ce

am ccbf5930: am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs."

* commit 'ccbf59304645dde557e24e7a8dd1440111d1a3ce':
  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
 
 #######################################