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

Commit 4dbb3545 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Check available host libraries 

Soong has a list of allowed host libraries. Check that list for make
modules as well.

Test: build/soong/build_test.bash (Linux&Darwin, aosp&internal)
Test: Add bad library in LOCAL_LDLIBS, ensure it errors
Change-Id: Icc48533487576998b049dc6c704c410172a91521
parent 557eae21

core/binary.mk

+6 −4
Original line number Diff line number Diff line
@@ -1717,17 +1717,19 @@ my_ldlibs := $(filter -l%,$(my_ldlib_flags)) 
my_ldflags := $(filter-out -l%,$(my_ldlib_flags))



# One last verification check for ldlibs

ifndef LOCAL_IS_HOST_MODULE

my_allowed_ldlibs :=

ifndef LOCAL_IS_HOST_MODULE

  ifneq ($(LOCAL_SDK_VERSION),)

    my_allowed_ldlibs := $(addprefix -l,$(NDK_PREBUILT_SHARED_LIBRARIES))

  endif

else

  my_allowed_ldlibs := $($(my_prefix)AVAILABLE_LIBRARIES)

endif



my_bad_ldlibs := $(filter-out $(my_allowed_ldlibs),$(my_ldlibs))

ifneq ($(my_bad_ldlibs),)

  $(error $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): Bad LOCAL_LDLIBS entries: $(my_bad_ldlibs))

endif

endif



# my_cxx_ldlibs may contain linker flags need to wrap certain libraries

# (start-group/end-group), so append after the check above.