diff options
author | Stephen Hines <srhines@google.com> | 2012-11-28 16:52:41 -0800 |
---|---|---|
committer | Stephen Hines <srhines@google.com> | 2012-12-12 14:58:02 -0800 |
commit | e719f28d938d3290ac591769a15b0b5e9e64fabb (patch) | |
tree | 617162f7893608dd7ca614b8892d3d84d3018721 /core/package.mk | |
parent | d019ecc24609fd70f7140b44f8d12e9dac601b61 (diff) | |
download | build-e719f28d938d3290ac591769a15b0b5e9e64fabb.zip build-e719f28d938d3290ac591769a15b0b5e9e64fabb.tar.gz build-e719f28d938d3290ac591769a15b0b5e9e64fabb.tar.bz2 |
Build rules for Renderscript compatibility library.
Bug: 7419958
Change-Id: I2e0f0bb632e6ff22b2cf1a1b96b28364637995cc
Diffstat (limited to 'core/package.mk')
-rw-r--r-- | core/package.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/package.mk b/core/package.mk index 3af1afb..c0bc7d8 100644 --- a/core/package.mk +++ b/core/package.mk @@ -191,6 +191,8 @@ endif # LOCAL_SDK_VERSION endif # EMMA_INSTRUMENT_STATIC endif # LOCAL_EMMA_INSTRUMENT +rs_compatibility_jni_libs := + ################################# include $(BUILD_SYSTEM)/java.mk ################################# @@ -324,6 +326,12 @@ jni_shared_libraries := \ $(addsuffix $(so_suffix), \ $(LOCAL_JNI_SHARED_LIBRARIES))) +# Include RS dynamically-generated libraries as well +# Keep this ifneq, as the += otherwise adds spaces that need to be stripped. +ifneq ($(rs_compatibility_jni_libs),) +jni_shared_libraries += $(rs_compatibility_jni_libs) +endif + # App explicitly requires the prebuilt NDK libstlport_shared.so. # libstlport_shared.so should never go to the system image. # Instead it should be packaged into the apk. |