From: Ying Wang <wangying@google.com>
Date: Thu, 14 Jun 2012 22:29:20 +0000 (-0700)
Subject: Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build
X-Git-Tag: android-x86-4.4-r1~1001^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=81f0fd6cdbf42d1034bf9e9f36991a131eca3f4f;p=android-x86%2Fbuild.git

Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build

To save space.

Change-Id: I7c88c13e4225bed89106917de57cbae74fc79ab8
---

diff --git a/core/package.mk b/core/package.mk
index c68903137..45f1fcfff 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -87,6 +87,15 @@ ifeq ($(filter tests, $(LOCAL_MODULE_TAGS)),)
 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