Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1d7b3a4 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Prevent vendor libs from depending on private VNDK libraries" am: 492f67c0 

am: 327a5119

Change-Id: I297b8d4c96101d3e2b82ba63585626c6821786e1
parents 1e3df664 327a5119

core/binary.mk

+16 −3
Original line number Diff line number Diff line
@@ -1415,9 +1415,22 @@ my_link_type := native:ndk 
my_warn_types :=

my_allowed_types := native:ndk

else ifdef LOCAL_USE_VNDK

    _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

        my_allowed_types := native:vendor native:vndk

    endif

else

my_link_type := native:platform

my_warn_types :=

core/install_jni_libs_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -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))

core/prebuilt_internal.mk

+10 −1
Original line number Diff line number Diff line
@@ -155,7 +155,16 @@ export_cflags := 
ifdef LOCAL_SDK_VERSION

my_link_type := native:ndk

else ifdef LOCAL_USE_VNDK

    _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