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

Commit c4791181 authored by Colin Cross's avatar Colin Cross
Browse files

Use vendor variants of Soong header libraries for vendor modules 

Mark Soong header libraries with vendor variants as SPLIT_VENDOR
so that Make will use the vendor variant for vendor modules.

Bug: 114238698
Test: m checkbuild
Change-Id: I912ab9f4e19d73a1213d60b9795ee30ca87ef614
parent 71034e37

core/header_library_internal.mk

+10 −0
Original line number Diff line number Diff line
@@ -11,6 +11,16 @@ ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)),) 
$(error $(LOCAL_PATH): Cannot set module stem for a library)

endif



ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

  ifdef LOCAL_USE_VNDK

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

    ifneq ($(name_without_suffix),$(LOCAL_MODULE))

      SPLIT_VENDOR.$(LOCAL_MODULE_CLASS).$(name_without_suffix) := 1

    endif

    name_without_suffix :=

  endif

endif



include $(BUILD_SYSTEM)/binary.mk



ifneq ($(strip $(all_objects)),)