openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Don't check link type of Soong app JNI libraries" am: 642343975e 

Change-Id: I03c813b616413826dbccbecc5cc89072481d293a
This commit is contained in:
Treehugger Robot 2020-05-15 07:42:57 +00:00 committed by Automerger Merge Worker
parent 09dd92a862 642343975e
commit 2f05acb7fe
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/install_jni_libs_internal.mk
View File

@ -124,17 +124,15 @@ ifneq ($(strip $(LOCAL_JNI_SHARED_LIBRARIES)),)
my_allowed_types := $(my_allowed_ndk_types) native:platform native:product native:vendor native:vndk native:vndk_private native:platform_vndk
endif
ifneq (,$(LOCAL_SDK_VERSION))
ifeq ($(SOONG_ANDROID_MK),$(LOCAL_MODULE_MAKEFILE))
# SOONG_SDK_VARIANT_MODULES isn't complete yet while parsing Soong modules, and Soong has
# already ensured that apps link against the correct SDK variants, rewrite all JNI libraries
# to the SDK variant.
my_link_deps := $(addprefix SHARED_LIBRARIES:,$(addsuffix .sdk,$(LOCAL_JNI_SHARED_LIBRARIES)))
else
my_link_deps := $(addprefix SHARED_LIBRARIES:,$(call use_soong_sdk_libraries,$(LOCAL_JNI_SHARED_LIBRARIES)))
endif
ifeq ($(SOONG_ANDROID_MK),$(LOCAL_MODULE_MAKEFILE))
# SOONG_SDK_VARIANT_MODULES isn't complete yet while parsing Soong modules, and Soong has
# already ensured that apps link against the correct SDK variants, don't check them.
else
my_link_deps := $(addprefix SHARED_LIBRARIES:,$(LOCAL_JNI_SHARED_LIBRARIES))
ifneq (,$(LOCAL_SDK_VERSION))
my_link_deps := $(addprefix SHARED_LIBRARIES:,$(call use_soong_sdk_libraries,$(LOCAL_JNI_SHARED_LIBRARIES)))
else
my_link_deps := $(addprefix SHARED_LIBRARIES:,$(LOCAL_JNI_SHARED_LIBRARIES))
endif
endif
my_common :=