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

Commit 4297c39e authored by Dan Albert's avatar Dan Albert
Browse files

Also restrict NDK linking by static/shared STL. 

Test: make checkbuild
Bug: None
Change-Id: I0eb29ec483c069d1c12f444fd2e94cc6eb320f93
parent b2e9b2b3

core/allowed_ndk_types.mk

+38 −9
Original line number Diff line number Diff line
@@ -6,44 +6,62 @@ 
#   LOCAL_SDK_VERSION

# Output variables:

#   my_ndk_stl_family: Family of the NDK STL.

#   my_ndk_stl_link_type: STL link type, static or shared.

#   my_allowed_ndk_types: Types of NDK modules that may be linked.

#   my_warn_ndk_types: Types of NDK modules that shouldn't be linked, but are.



my_allowed_ndk_types :=

my_warn_ndk_types :=

my_ndk_stl_family :=

my_ndk_stl_link_type :=



ifdef LOCAL_SDK_VERSION

    ifeq ($(LOCAL_NDK_STL_VARIANT),)

        my_ndk_stl_family := system

        my_ndk_stl_link_type := shared

    else ifeq ($(LOCAL_NDK_STL_VARIANT),system)

        my_ndk_stl_family := system

        my_ndk_stl_link_type := shared

    else ifeq ($(LOCAL_NDK_STL_VARIANT),c++_shared)

        my_ndk_stl_family := libc++

        my_ndk_stl_link_type := shared

    else ifeq ($(LOCAL_NDK_STL_VARIANT),c++_static)

        my_ndk_stl_family := libc++

        my_ndk_stl_link_type := static

    else ifeq ($(LOCAL_NDK_STL_VARIANT),gnustl_static)

        my_ndk_stl_family := gnustl

        my_ndk_stl_link_type := static

    else ifeq ($(LOCAL_NDK_STL_VARIANT),stlport_shared)

        my_ndk_stl_family := stlport

        my_ndk_stl_link_type := shared

    else ifeq ($(LOCAL_NDK_STL_VARIANT),stlport_static)

        my_ndk_stl_family := stlport

        my_ndk_stl_link_type := static

    else ifeq ($(LOCAL_NDK_STL_VARIANT),none)

        my_ndk_stl_family := none

        my_ndk_stl_link_type := none

    else

        $(call pretty-error,invalid LOCAL_NDK_STL_VARIANT: $(LOCAL_NDK_STL_VARIANT))

    endif



    ifeq ($(LOCAL_MODULE_CLASS),STATIC_LIBRARIES)

        # The "none" link type indicates that nothing is actually linked. Since

        # this is a static library, it's still up to the final use of the

        # library whether a static or shared STL should be used.

        my_ndk_stl_link_type := none

    endif



    # The system STL is only the C++ ABI layer, so it's compatible with any STL.

    my_allowed_ndk_types += native:ndk:system

    my_allowed_ndk_types += native:ndk:system:shared

    my_allowed_ndk_types += native:ndk:system:none



    # Libaries that don't use the STL can be linked to anything.

    my_allowed_ndk_types += native:ndk:none

    my_allowed_ndk_types += native:ndk:none:none



    # And it's okay to link your own STL type. Strictly speaking there are more

    # restrictions depending on static vs shared STL, but that will be a follow

    # up patch.

    my_allowed_ndk_types += native:ndk:$(my_ndk_stl_family)

    # And it's always okay to link a static library that uses your own STL type.

    # Since nothing was actually linked for the static library, it is up to the

    # first linked library in the dependency chain which gets used.

    my_allowed_ndk_types += native:ndk:$(my_ndk_stl_family):none



    ifeq ($(LOCAL_MODULE_CLASS),APPS)

        # For an app package, it's actually okay to depend on any set of STLs.
@@ -51,12 +69,23 @@ ifdef LOCAL_SDK_VERSION 
        # already been checked for consistency, and if they don't they'll be

        # kept isolated by RTLD_LOCAL anyway.

        my_allowed_ndk_types += \

            native:ndk:gnustl native:ndk:libc++ native:ndk:stlport

            native:ndk:gnustl:static \

            native:ndk:libc++:shared native:ndk:libc++:static \

            native:ndk:stlport:shared native:ndk:stlport:static \



        # The "none" link type that used by static libraries is intentionally

        # omitted here. We should only be dealing with shared libraries in

        # LOCAL_JNI_SHARED_LIBRARIES.

    else ifeq ($(my_ndk_stl_link_type),shared)

        # Modules linked to a shared STL can only use another shared STL.

        my_allowed_ndk_types += native:ndk:$(my_ndk_stl_family):shared

    endif

    # Else we are a non-static library that uses a static STL, and are

    # incompatible with all other shared libraries that use an STL.

else

    my_allowed_ndk_types := native:ndk:none native:ndk:system

    my_allowed_ndk_types := native:ndk:none:none native:ndk:system:shared

    ifeq ($(LOCAL_MODULE_CLASS),APPS)

        # CTS is bad and it should feel bad: http://b/13249737

        my_warn_ndk_types += native:ndk:libc++

        my_warn_ndk_types += native:ndk:libc++:static

    endif

endif

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -1407,7 +1407,7 @@ endif 
include $(BUILD_SYSTEM)/allowed_ndk_types.mk



ifdef LOCAL_SDK_VERSION

my_link_type := native:ndk:$(my_ndk_stl_family)

my_link_type := native:ndk:$(my_ndk_stl_family):$(my_ndk_stl_link_type)

my_warn_types := $(my_warn_ndk_types)

my_allowed_types := $(my_allowed_ndk_types)

else ifdef LOCAL_USE_VNDK

core/prebuilt_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ export_cflags := 
include $(BUILD_SYSTEM)/allowed_ndk_types.mk



ifdef LOCAL_SDK_VERSION

my_link_type := native:ndk:$(my_ndk_stl_family)

my_link_type := native:ndk:$(my_ndk_stl_family):$(my_ndk_stl_link_type)

else ifdef LOCAL_USE_VNDK

    _name := $(patsubst %.vendor,%,$(LOCAL_MODULE))

    ifneq ($(filter $(_name),$(VNDK_CORE_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES) $(LLNDK_LIBRARIES)),)