From 47aaaa704a56f37889a8b54498fbb7daf9a6de30 Mon Sep 17 00:00:00 2001 From: Sam Mortimer Date: Mon, 16 Nov 2015 14:47:25 -0800 Subject: Permit redirection of vendor to system For devices where /system/vendor needs to be a symlink to /vendor. This allows a target to set TARGET_COPY_OUT_VENDOR := system in order to force modules that want to be placed in vendor to instead be redirected into /system. eg angler Change-Id: I4bffcefcda0b33dc5350b1702ec6d0166b18d775 --- core/envsetup.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/envsetup.mk') diff --git a/core/envsetup.mk b/core/envsetup.mk index 08524b3..6476934 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -178,8 +178,8 @@ board_config_mk := # Now we can substitute with the real value of TARGET_COPY_OUT_VENDOR ifeq ($(TARGET_COPY_OUT_VENDOR),$(_vendor_path_placeholder)) TARGET_COPY_OUT_VENDOR := system/vendor -else ifeq ($(filter vendor system/vendor,$(TARGET_COPY_OUT_VENDOR)),) -$(error TARGET_COPY_OUT_VENDOR must be either 'vendor' or 'system/vendor', seeing '$(TARGET_COPY_OUT_VENDOR)'.) +else ifeq ($(filter vendor system/vendor system,$(TARGET_COPY_OUT_VENDOR)),) +$(error TARGET_COPY_OUT_VENDOR must be either 'vendor', 'system/vendor' or 'system', seeing '$(TARGET_COPY_OUT_VENDOR)'.) endif PRODUCT_COPY_FILES := $(subst $(_vendor_path_placeholder),$(TARGET_COPY_OUT_VENDOR),$(PRODUCT_COPY_FILES)) ########################################### -- cgit v1.1