diff options
| author | Sam Mortimer <sam@mortimer.me.uk> | 2015-11-16 14:47:25 -0800 |
|---|---|---|
| committer | Sam Mortimer <sam@mortimer.me.uk> | 2015-11-16 15:37:02 -0800 |
| commit | 47aaaa704a56f37889a8b54498fbb7daf9a6de30 (patch) | |
| tree | 078e1a8f817e434607dd043279babff27f274311 /core/envsetup.mk | |
| parent | 58fa71624301f25f1de9aa5ced171ca868e60db2 (diff) | |
| download | build-47aaaa704a56f37889a8b54498fbb7daf9a6de30.zip build-47aaaa704a56f37889a8b54498fbb7daf9a6de30.tar.gz build-47aaaa704a56f37889a8b54498fbb7daf9a6de30.tar.bz2 | |
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
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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)) ########################################### |