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

Merge "Don't check link type of Soong app JNI libraries"

Browse Source
This commit is contained in:
Treehugger Robot
2020-05-15 07:17:42 +00:00
committed by Gerrit Code Review
parent 4e0bce688c 1c8d81e5d9
commit 642343975e
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/install_jni_libs_internal.mk
View File

@@ -124,18 +124,16 @@ 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 my_allowed_types := $(my_allowed_ndk_types) native:platform native:product native:vendor native:vndk native:vndk_private native:platform_vndk
endif endif
ifneq (,$(LOCAL_SDK_VERSION))
ifeq ($(SOONG_ANDROID_MK),$(LOCAL_MODULE_MAKEFILE)) ifeq ($(SOONG_ANDROID_MK),$(LOCAL_MODULE_MAKEFILE))
# SOONG_SDK_VARIANT_MODULES isn't complete yet while parsing Soong modules, and Soong has # 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 # already ensured that apps link against the correct SDK variants, don't check them.
# to the SDK variant.
my_link_deps := $(addprefix SHARED_LIBRARIES:,$(addsuffix .sdk,$(LOCAL_JNI_SHARED_LIBRARIES)))
else else
ifneq (,$(LOCAL_SDK_VERSION))
my_link_deps := $(addprefix SHARED_LIBRARIES:,$(call use_soong_sdk_libraries,$(LOCAL_JNI_SHARED_LIBRARIES))) my_link_deps := $(addprefix SHARED_LIBRARIES:,$(call use_soong_sdk_libraries,$(LOCAL_JNI_SHARED_LIBRARIES)))
endif
else else
my_link_deps := $(addprefix SHARED_LIBRARIES:,$(LOCAL_JNI_SHARED_LIBRARIES)) my_link_deps := $(addprefix SHARED_LIBRARIES:,$(LOCAL_JNI_SHARED_LIBRARIES))
endif endif
endif
my_common := my_common :=
include $(BUILD_SYSTEM)/link_type.mk include $(BUILD_SYSTEM)/link_type.mk