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

Commit 492f67c0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 9f588bcd a3fb1588

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