Merge "Use vendor variants of Soong header libraries for vendor modules"

am: 1a9bb089c2

Change-Id: I6c765ad038e403aadb0023dba3ce2c3c7158546e
This commit is contained in:
Colin Cross
2018-09-06 19:54:24 -07:00
committed by android-build-merger

View File

@@ -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)),)