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

Merge "Error out if LOCAL_PREBUILT_JNI_LIBS and LOCAL_CERTIFICATE := PRESIGNED are used"

Browse Source
This commit is contained in:
Nick Kralevich
2015-04-19 06:47:02 +00:00
committed by Android (Google) Code Review
parent dd56f344a5 445e111def
commit 12753112f3
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/install_jni_libs_internal.mk
View File

@@ -85,6 +85,15 @@ ifdef my_extracted_jni_libs
ifndef my_prebuilt_src_file ifndef my_prebuilt_src_file
$(error No prebuilt apk to extract prebuilt jni libraries $(my_extracted_jni_libs)) $(error No prebuilt apk to extract prebuilt jni libraries $(my_extracted_jni_libs))
endif endif
ifeq ($(LOCAL_CERTIFICATE),PRESIGNED)
$(warning Extracting files using LOCAL_PREBUILT_JNI_LIBS cannot be done while)
$(warning using LOCAL_CERTIFICATE:=PRESIGNED, as this would corrupt)
$(warning the APK or waste disk space. Instead, you should delete)
$(warning LOCAL_PREBUILT_JNI_LIBS and use LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES:=true)
$(warning This will allow loading of shared libraries directly from the APK,)
$(warning eliminating the need to separately extract them.)
$(error Failed to build: $(LOCAL_MODULE))
endif
# We use the first jni lib file as dependency. # We use the first jni lib file as dependency.
my_installed_prebuilt_jni := $(my_app_lib_path)/$(notdir $(firstword $(my_extracted_jni_libs))) my_installed_prebuilt_jni := $(my_app_lib_path)/$(notdir $(firstword $(my_extracted_jni_libs)))
$(my_installed_prebuilt_jni): PRIVATE_JNI_LIBS := $(my_extracted_jni_libs) $(my_installed_prebuilt_jni): PRIVATE_JNI_LIBS := $(my_extracted_jni_libs)