diff options
| author | Ying Wang <wangying@google.com> | 2012-06-18 15:29:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-18 15:29:10 -0700 |
| commit | 692a3d598d74da146f13139ce65e2868911a45b2 (patch) | |
| tree | 28a5d79f2338330ea88ab7dfab4d8414f220a6d3 /core/package.mk | |
| parent | 81f0fd6cdbf42d1034bf9e9f36991a131eca3f4f (diff) | |
| download | build-692a3d598d74da146f13139ce65e2868911a45b2.zip build-692a3d598d74da146f13139ce65e2868911a45b2.tar.gz build-692a3d598d74da146f13139ce65e2868911a45b2.tar.bz2 | |
Revert "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build"
This reverts commit 81f0fd6cdbf42d1034bf9e9f36991a131eca3f4f
The change broke the CTS build:
CTS does need the jni library embedded in the apk.
Diffstat (limited to 'core/package.mk')
| -rw-r--r-- | core/package.mk | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/core/package.mk b/core/package.mk index 45f1fcf..c689031 100644 --- a/core/package.mk +++ b/core/package.mk @@ -87,15 +87,6 @@ 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 |