StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build"

Browse Source 
This reverts commit 81f0fd6cdb

The change broke the CTS build:
CTS does need the jni library embedded in the apk.
This commit is contained in:
Ying Wang
2012-06-18 15:29:10 -07:00
committed by Android (Google) Code Review
parent 81f0fd6cdb
commit 692a3d598d
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/package.mk
View File

@@ -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