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

Merge "Prevent vendor libs from depending on private VNDK libraries" 

am: 492f67c0ac

Change-Id: If73d1034a1c1c5668f2b3367e8b498e758494bf8
This commit is contained in:
Jiyong Park 2017-10-11 01:51:24 +00:00 committed by android-build-merger
parent a0dd1e08f2 492f67c0ac
commit 327a511925
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/binary.mk
View File

@ -1415,9 +1415,22 @@ my_link_type := native:ndk
my_warn_types :=
my_allowed_types := native:ndk
else ifdef LOCAL_USE_VNDK
my_link_type := native:vendor
my_warn_types :=
my_allowed_types := native:vendor
_name := $(patsubst %.vendor,%,$(LOCAL_MODULE))
ifneq ($(filter $(_name),$(VNDK_CORE_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES) $(LLNDK_LIBRARIES)),)
ifeq ($(filter $(_name),$(VNDK_PRIVATE_LIBRARIES)),)
my_link_type := native:vndk
else
my_link_type := native:vndk_private
endif
my_warn_types :=
my_allowed_types := native:vndk native:vndk_private
else
# Modules installed to /vendor cannot directly depend on modules marked
# with vendor_available: false
my_link_type := native:vendor
my_warn_types :=
my_allowed_types := native:vendor native:vndk
endif
else
my_link_type := native:platform
my_warn_types :=

2
core/install_jni_libs_internal.mk
View File

@ -116,7 +116,7 @@ my_allowed_types := native:ndk
else
my_link_type := app:platform
my_warn_types :=
my_allowed_types := native:ndk native:platform native:vendor
my_allowed_types := native:ndk native:platform native:vendor native:vndk native:vndk_private
endif
my_link_deps := $(addprefix SHARED_LIBRARIES:,$(LOCAL_JNI_SHARED_LIBRARIES))

11
core/prebuilt_internal.mk
View File

@ -155,7 +155,16 @@ export_cflags :=
ifdef LOCAL_SDK_VERSION
my_link_type := native:ndk
else ifdef LOCAL_USE_VNDK
my_link_type := native:vendor
_name := $(patsubst %.vendor,%,$(LOCAL_MODULE))
ifneq ($(filter $(_name),$(VNDK_CORE_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES) $(LLNDK_LIBRARIES)),)
ifeq ($(filter $(_name),$(VNDK_PRIVATE_LIBRARIES)),)
my_link_type := native:vndk
else
my_link_type := native:vndk_private
endif
else
my_link_type := native:vendor
endif
else
my_link_type := native:platform
endif