commit 596549c4d3c3bfb35c6764d1efd58c1d9f8f197b
author Torne (Richard Coles) <torne@google.com> Mon Jun 18 01:51:46 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 18 01:51:46 2012 -0700
tree bcc2c33860304107abcef99144d516eca43a9411
parent e4ff0b0042446baeb8a9dcbee3e031b3ae26cfca
parent bffaef246a5b838eb40a642463b1186935424fae

Merge "Make building an empty static library work."

core/package.mk

diff --git a/core/package.mk b/core/package.mk
index c689031..45f1fcf 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -87,6 +87,15 @@
 LOCAL_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) -z
 endif
 
+# Convert LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in full build,
+# for preloaded apks don't like embedded jni libraries.
+ifndef TARGET_BUILD_APPS
+ifdef LOCAL_JNI_SHARED_LIBRARIES
+LOCAL_REQUIRED_MODULES += $(LOCAL_JNI_SHARED_LIBRARIES)
+LOCAL_JNI_SHARED_LIBRARIES :=
+endif
+endif
+
 ifeq (,$(LOCAL_ASSET_DIR))
 LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets
 endif